From 35942fd766db76f544f18987b84ed2b1eba390db Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Mon, 21 Oct 2024 19:15:28 +0000
Subject: [PATCH] restore code lost on rebase, re #3278, fixes #4735
Closes #4735
Merge request studip/studip!3532
---
app/controllers/course/timesrooms.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/course/timesrooms.php b/app/controllers/course/timesrooms.php
index ba225efd298..3989edc3242 100644
--- a/app/controllers/course/timesrooms.php
+++ b/app/controllers/course/timesrooms.php
@@ -1758,9 +1758,9 @@ class Course_TimesroomsController extends AuthenticatedController
/**
* Restores a previously stored request from trails' flash object
*/
- private function restoreRequest(array $fields)
+ private function restoreRequest(array $fields, $request = null)
{
- $request = $this->flash['request'];
+ $request = $this->flash['request'] ?? $request;
if ($request) {
foreach ($fields as $field) {
--
GitLab