diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2022-05-11 10:26:56 +0000 |
|---|---|---|
| committer | David Siegfried <david.siegfried@uni-vechta.de> | 2022-05-11 10:26:56 +0000 |
| commit | 5cc273963fe52f8d4b964bfaab643bc353965396 (patch) | |
| tree | bd5fcc2cae2b185eda6c03f7f571edecd51cd265 /lib/calendar_functions.inc.php | |
| parent | dde14b1358909aa119806cad88f516fcf1ac5076 (diff) | |
remove special handling of reformation day 2017, fixes #958
Closes #958
Merge request studip/studip!553
Diffstat (limited to 'lib/calendar_functions.inc.php')
| -rw-r--r-- | lib/calendar_functions.inc.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/calendar_functions.inc.php b/lib/calendar_functions.inc.php index 79bd328..7448e31 100644 --- a/lib/calendar_functions.inc.php +++ b/lib/calendar_functions.inc.php @@ -90,7 +90,7 @@ function holiday ($tmstamp, $mod = "") { case 172: $name = _("Sommeranfang"); $col = 1; break; case 266: $name = _("Herbstanfang"); $col = 1; break; case 276: $name = _("Tag der deutschen Einheit"); $col = 3; break; - case 304: $name = _("Reformationstag"); $col = 2; break; + case 304: $name = _("Reformationstag"); $col = $year == 2017 ? 3 : 2; break; case 305: $name = _("Allerheiligen"); $col = 1; break; case 315: $name = _("Martinstag"); $col = 1; break; case 340: $name = _("Nikolaus"); $col = 1; break; @@ -101,11 +101,6 @@ function holiday ($tmstamp, $mod = "") { case 365: $name = _("Silvester"); $col = 1; break; } - // special handling of Reformation Day in 2017 - if ($doy == 304 && $year == 2017) { - $col = 3; - } - // Die Sonntagsfeiertage if (date("w", $tmstamp) == 0) { if ($doy > 127 && $doy < 135) { |