From 10f79074de8d6816e8a3bf308d4c91779b226915 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 11 Jan 2024 08:44:46 +0000
Subject: [PATCH] fixes #3623
Closes #3623
Merge request studip/studip!2511
---
lib/classes/calendar/CalendarScheduleModel.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/classes/calendar/CalendarScheduleModel.php b/lib/classes/calendar/CalendarScheduleModel.php
index 4b8a63af6b3..ff9bce8e754 100644
--- a/lib/classes/calendar/CalendarScheduleModel.php
+++ b/lib/classes/calendar/CalendarScheduleModel.php
@@ -219,7 +219,7 @@ class CalendarScheduleModel
$details = $stmt->fetch();
if ($entry['type'] === 'virtual') {
- $entry['color'] = $details['color'] ?: DEFAULT_COLOR_VIRTUAL;
+ $entry['color'] = $details ? ($details['color'] ?: DEFAULT_COLOR_VIRTUAL) : DEFAULT_COLOR_VIRTUAL;
$entry['icons'][] = [
'image' => Icon::create('tag', Icon::ROLE_INFO_ALT)->asImagePath(),
'title' => _("Dies ist eine vorgemerkte Veranstaltung")
@@ -319,9 +319,9 @@ class CalendarScheduleModel
AND s.start_time <= :begin
AND (semester_courses.semester_id IS NULL OR semester_courses.semester_id = :semester_id)
");
- $stmt->bindParam(':begin', $semester['beginn']);
- $stmt->bindParam(':semester_id', $semester['semester_id']);
- $stmt->bindParam(':userid', $user_id);
+ $stmt->bindValue(':begin', $semester['beginn']);
+ $stmt->bindValue(':semester_id', $semester['semester_id']);
+ $stmt->bindValue(':userid', $user_id);
$stmt->execute();
while ($entry = $stmt->fetch(PDO::FETCH_ASSOC)) {
--
GitLab