From adeef25cdd76acffda1462d4d949d447dba4acf6 Mon Sep 17 00:00:00 2001 From: David Siegfried Date: Thu, 24 Jul 2025 11:28:27 +0000 Subject: prevent php-warnings, fixes #5752 Closes #5752 Merge request studip/studip!4384 --- app/controllers/course/block_appointments.php | 2 +- app/controllers/course/room_requests.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/course/block_appointments.php b/app/controllers/course/block_appointments.php index 1628e94..88d7378 100644 --- a/app/controllers/course/block_appointments.php +++ b/app/controllers/course/block_appointments.php @@ -26,7 +26,7 @@ class Course_BlockAppointmentsController extends AuthenticatedController { parent::before_filter($action, $args); - $course_id = $args[0]; + $course_id = $args[0] ?? null; $this->course_id = Request::option('cid', $course_id); if (!get_object_type($this->course_id, ['sem']) || diff --git a/app/controllers/course/room_requests.php b/app/controllers/course/room_requests.php index 85d7a70..9ff4b8b 100644 --- a/app/controllers/course/room_requests.php +++ b/app/controllers/course/room_requests.php @@ -481,7 +481,10 @@ class Course_RoomRequestsController extends AuthenticatedController $this->redirect('course/room_requests/request_show_summary/' . $this->request_id ); } else { $room = Room::find($this->fromSession('room_id')); - $this->toSession('room_category_id', $room->category_id); + + if ($room) { + $this->toSession('room_category_id', $room->category_id); + } $this->redirect( 'course/room_requests/request_find_matching_rooms/' . $this->request_id . '/2' -- cgit v1.0