aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/calendar_functions.inc.php2
-rw-r--r--lib/classes/JsonApi/Routes/Holidays/HolidaysShow.php2
-rw-r--r--lib/models/ConsultationBlock.php2
-rw-r--r--lib/models/SemesterHoliday.php2
4 files changed, 5 insertions, 3 deletions
diff --git a/lib/calendar_functions.inc.php b/lib/calendar_functions.inc.php
index b35e9a1..99f61a9 100644
--- a/lib/calendar_functions.inc.php
+++ b/lib/calendar_functions.inc.php
@@ -44,6 +44,8 @@
* @param $tmstamp
* @return array{name: string, col: int}|false
* @see Holidays::isHoliday()
+ *
+ * @deprecated Will be removed with Stud.IP 7.0.
*/
function holiday ($tmstamp) {
return Holidays::isHoliday($tmstamp);
diff --git a/lib/classes/JsonApi/Routes/Holidays/HolidaysShow.php b/lib/classes/JsonApi/Routes/Holidays/HolidaysShow.php
index eb413d0..85d95b5 100644
--- a/lib/classes/JsonApi/Routes/Holidays/HolidaysShow.php
+++ b/lib/classes/JsonApi/Routes/Holidays/HolidaysShow.php
@@ -39,7 +39,7 @@ final class HolidaysShow extends NonJsonApiController
$holidays = [];
while ($current < $end) {
- $holiday = holiday($current);
+ $holiday = \Holidays::isHoliday($current);
if ($holiday) {
$holidays[date('Y-m-d', $current)] = [
'holiday' => $holiday['name'],
diff --git a/lib/models/ConsultationBlock.php b/lib/models/ConsultationBlock.php
index 8971dce..3e4d8e0 100644
--- a/lib/models/ConsultationBlock.php
+++ b/lib/models/ConsultationBlock.php
@@ -174,7 +174,7 @@ class ConsultationBlock extends SimpleORMap implements PrivacyObject
$warnings = [];
while ($current <= $end) {
- $temp = holiday($current);
+ $temp = Holidays::isHoliday($current);
$holiday = is_array($temp) && $temp['col'] === 3;
if (!$holiday) {
diff --git a/lib/models/SemesterHoliday.php b/lib/models/SemesterHoliday.php
index ce56e48..3cea14b 100644
--- a/lib/models/SemesterHoliday.php
+++ b/lib/models/SemesterHoliday.php
@@ -135,7 +135,7 @@ class SemesterHoliday extends SimpleORMap
// Check all other holidays
if (!$check_vacation_only) {
- return holiday($time);
+ return Holidays::isHoliday($time);
}
// Nothing found