From cedbca5205b15f2b5b6928640702ddfd87a38341 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 24 Jan 2023 14:34:12 +0000
Subject: [PATCH] prevent warning (and suppress the massive to tidy up this
mess), fixes #2059
Closes #2059
Merge request studip/studip!1339
---
templates/dates/_seminar_rooms.php | 2 +-
templates/dates/seminar_html.php | 12 ++++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/templates/dates/_seminar_rooms.php b/templates/dates/_seminar_rooms.php
index c10fa453e44..543044ad5bb 100644
--- a/templates/dates/_seminar_rooms.php
+++ b/templates/dates/_seminar_rooms.php
@@ -7,7 +7,7 @@ $prefix = $prefix ?? ', ';
$hide_empty = $hide_empty ?? false;
$limit = $limit ?? 3;
$assigned = $assigned ?: [];
-$freetext = $freetext ?: [];
+$freetext = $freetext ?? [];
$plain = $plain ?? false;
if ($assigned || $freetext) {
diff --git a/templates/dates/seminar_html.php b/templates/dates/seminar_html.php
index 1f55dbfbbb4..ce84efdbbb2 100644
--- a/templates/dates/seminar_html.php
+++ b/templates/dates/seminar_html.php
@@ -47,15 +47,19 @@ if (!$dates['regular']['turnus_data'] && empty($dates['irregular'])) {
if (isset($dates['irregular']) && is_array($dates['irregular'])) {
foreach ($dates['irregular'] as $date) {
- if (!isset($irregular_rooms[$date['resource_id']])) {
- $irregular_rooms[$date['resource_id']] = 0;
- }
$irregular[] = $date;
$irregular_strings[] = $date['tostring'];
if ($date['resource_id']) {
+ if (!isset($irregular_rooms[$date['resource_id']])) {
+ $irregular_rooms[$date['resource_id']] = 0;
+ }
$irregular_rooms[$date['resource_id']]++;
} elseif ($date['raum']) {
- $freetext_rooms['(' . htmlReady($date['raum']) . ')']++;
+ $temp = '(' . htmlReady($date['raum']) . ')';
+ if (!isset($freetext_rooms[$temp])) {
+ $irregular_rooms[$temp] = 0;
+ }
+ $freetext_rooms[$temp]++;
}
}
// Remove invalid entry if present
--
GitLab