From 94476234280903c6687479b1d4af70b11dcd91c7 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 19 Aug 2024 10:01:49 +0000
Subject: [PATCH] fix variable access and storing of removed property, fixes
#4485
Closes #4485
Merge request studip/studip!3271
---
app/controllers/calendar/calendar.php | 2 +-
lib/classes/calendar/ICalendarImport.php | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/app/controllers/calendar/calendar.php b/app/controllers/calendar/calendar.php
index 0cb96ad9178..cc29e5524be 100644
--- a/app/controllers/calendar/calendar.php
+++ b/app/controllers/calendar/calendar.php
@@ -815,7 +815,7 @@ class Calendar_CalendarController extends AuthenticatedController
CSRFProtection::verifySecurityToken();
$range_id = Context::getId() ?? User::findCurrent()->id;
$calendar_import = new ICalendarImport($range_id);
- $calendar_import->convertPublicToPrivate(Request::bool('import_as_private_imp'));
+ $calendar_import->convertPublicToPrivate(Request::bool('import_privat', false));
$calendar_import->import(file_get_contents($_FILES['importfile']['tmp_name']));
$import_count = $calendar_import->getCountEvents();
PageLayout::postSuccess(sprintf(
diff --git a/lib/classes/calendar/ICalendarImport.php b/lib/classes/calendar/ICalendarImport.php
index 6ff7f80efc1..6d4a2607d50 100644
--- a/lib/classes/calendar/ICalendarImport.php
+++ b/lib/classes/calendar/ICalendarImport.php
@@ -352,7 +352,6 @@ class ICalendarImport
$date->access = $properties['CLASS'] ?? 'PRIVATE';
$date->user_category = $properties['CATEGORIES'];
$date->category = $properties['STUDIP_CATEGORY'] ?: 1;
- $date->priority = $properties['PRIORITY'] ?? '';
$date->location = $properties['LOCATION'];
if (is_array($properties['EXDATE'])) {
foreach ($properties['EXDATE'] as $exdate) {
--
GitLab