diff options
| author | Moritz Strohm <strohm@data-quest.de> | 2022-09-02 08:46:00 +0000 |
|---|---|---|
| committer | David Siegfried <david.siegfried@uni-vechta.de> | 2022-09-02 08:46:00 +0000 |
| commit | 3210f8de6641869613c28e16e83a905ee7b82bc5 (patch) | |
| tree | dd175b90da9ecdebff267ad88edc04211e7fde8a /app/controllers | |
| parent | 39df759266a938b3f41d2373345de9fbf548a0b7 (diff) | |
fix for BIESt #1099
Merge request studip/studip!658
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/calendar/calendar.php | 4 | ||||
| -rw-r--r-- | app/controllers/calendar/single.php | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/calendar/calendar.php b/app/controllers/calendar/calendar.php index 939b9d3..65dafa2 100644 --- a/app/controllers/calendar/calendar.php +++ b/app/controllers/calendar/calendar.php @@ -41,12 +41,14 @@ class Calendar_CalendarController extends AuthenticatedController $this->restrictions = [ 'STUDIP_CATEGORY' => $this->category ?: null, // hide events with status 3 (CalendarEvent::PARTSTAT_DECLINED) - 'STUDIP_GROUP_STATUS' => $this->settings['show_declined'] ? null : [0,1,2,5] + 'STUDIP_GROUP_STATUS' => !empty($this->settings['show_declined']) ? null : [0,1,2,5] ]; if ($this->category) { URLHelper::bindLinkParam('category', $this->category); } + $this->range_id = ''; + if (Config::get()->COURSE_CALENDAR_ENABLE && !Request::get('self') && Course::findCurrent()) { diff --git a/app/controllers/calendar/single.php b/app/controllers/calendar/single.php index 91525aa..2067e39 100644 --- a/app/controllers/calendar/single.php +++ b/app/controllers/calendar/single.php @@ -127,7 +127,6 @@ class Calendar_SingleController extends Calendar_CalendarController $cor = date('n', $this->atime) == 3 ? 1 : 0; $this->first_day = $month_start - $adow * 86400; $this->last_day = ((42 - ($adow + date('t', $this->atime))) % 7 + $cor) * 86400 + $month_end; - $this->calendars = []; for ($start_day = $this->first_day; $start_day <= $this->last_day; $start_day += 86400) { $this->calendars[] = SingleCalendar::getDayCalendar($this->range_id, |