From 73ad86a48c36d6ad29f19c381a1edb8e8b3d023e Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 11 May 2022 10:26:56 +0000
Subject: [PATCH] remove special handling of reformation day 2017, fixes #958
Closes #958
Merge request studip/studip!553
---
lib/calendar_functions.inc.php | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/lib/calendar_functions.inc.php b/lib/calendar_functions.inc.php
index 79bd32813b0..7448e31049a 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) {
--
GitLab