From 6f9a3df8cadbd5fef780e2f043626c43f0be88f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Till=20Gl=C3=B6ggler?= <till@gundk.it>
Date: Mon, 14 Aug 2023 14:28:02 +0200
Subject: [PATCH] fix some regressions
---
classes/OCRestClient/SchedulerClient.php | 2 +-
cronjobs/refresh_scheduled_events.php | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/classes/OCRestClient/SchedulerClient.php b/classes/OCRestClient/SchedulerClient.php
index fdc090f8..62b4dd91 100644
--- a/classes/OCRestClient/SchedulerClient.php
+++ b/classes/OCRestClient/SchedulerClient.php
@@ -141,7 +141,7 @@ class SchedulerClient extends OCRestClient
// also reset any custom made changes to the recording length, to prevent any unwanted effects for alternate schedules (if even activated)
$event->start = $date->date;
- $event->end = $date->date;
+ $event->end = $date->end_time;
$event->store();
}
diff --git a/cronjobs/refresh_scheduled_events.php b/cronjobs/refresh_scheduled_events.php
index 1f0cf9f5..7e20450d 100644
--- a/cronjobs/refresh_scheduled_events.php
+++ b/cronjobs/refresh_scheduled_events.php
@@ -88,9 +88,11 @@ class RefreshScheduledEvents extends CronJob
unset($curated_events[$se['event_id']]);
if ($cd->room_booking->resource_id == $se['resource_id']
- || $cd->room_booking->date != $se['coursedate_start']
- || $cd->room_booking->end_time != $se['coursedate_end'])
- {
+ && (
+ $cd->room_booking->date != $se['coursedate_start']
+ || $cd->room_booking->end_time != $se['coursedate_end']
+ )
+ ) {
$scheduler_client = SchedulerClient::create($se['seminar_id']);
$scheduler_client->updateEventForSeminar($se['seminar_id'], $se['resource_id'], $se['date_id'], $se['event_id']);
--
GitLab