diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2023-01-24 14:34:12 +0000 |
|---|---|---|
| committer | David Siegfried <david.siegfried@uni-vechta.de> | 2023-01-24 14:34:12 +0000 |
| commit | cedbca5205b15f2b5b6928640702ddfd87a38341 (patch) | |
| tree | 9fb6c765825f5d76ae80cc316d5a2356bba70fb3 | |
| parent | d25ae63e5e5e5ecbab703d715f284b43f0f6a9b7 (diff) | |
prevent warning (and suppress the massive to tidy up this mess), fixes #2059
Closes #2059
Merge request studip/studip!1339
| -rw-r--r-- | templates/dates/_seminar_rooms.php | 2 | ||||
| -rw-r--r-- | 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 c10fa45..543044a 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 1f55dbf..ce84efd 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 |