Skip to content
Snippets Groups Projects
Commit 10f79074 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

fixes #3623

Closes #3623

Merge request studip/studip!2511
parent 8ea4ca2d
No related branches found
No related tags found
No related merge requests found
...@@ -219,7 +219,7 @@ class CalendarScheduleModel ...@@ -219,7 +219,7 @@ class CalendarScheduleModel
$details = $stmt->fetch(); $details = $stmt->fetch();
if ($entry['type'] === 'virtual') { if ($entry['type'] === 'virtual') {
$entry['color'] = $details['color'] ?: DEFAULT_COLOR_VIRTUAL; $entry['color'] = $details ? ($details['color'] ?: DEFAULT_COLOR_VIRTUAL) : DEFAULT_COLOR_VIRTUAL;
$entry['icons'][] = [ $entry['icons'][] = [
'image' => Icon::create('tag', Icon::ROLE_INFO_ALT)->asImagePath(), 'image' => Icon::create('tag', Icon::ROLE_INFO_ALT)->asImagePath(),
'title' => _("Dies ist eine vorgemerkte Veranstaltung") 'title' => _("Dies ist eine vorgemerkte Veranstaltung")
...@@ -319,9 +319,9 @@ class CalendarScheduleModel ...@@ -319,9 +319,9 @@ class CalendarScheduleModel
AND s.start_time <= :begin AND s.start_time <= :begin
AND (semester_courses.semester_id IS NULL OR semester_courses.semester_id = :semester_id) AND (semester_courses.semester_id IS NULL OR semester_courses.semester_id = :semester_id)
"); ");
$stmt->bindParam(':begin', $semester['beginn']); $stmt->bindValue(':begin', $semester['beginn']);
$stmt->bindParam(':semester_id', $semester['semester_id']); $stmt->bindValue(':semester_id', $semester['semester_id']);
$stmt->bindParam(':userid', $user_id); $stmt->bindValue(':userid', $user_id);
$stmt->execute(); $stmt->execute();
while ($entry = $stmt->fetch(PDO::FETCH_ASSOC)) { while ($entry = $stmt->fetch(PDO::FETCH_ASSOC)) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment