From 0a2d890e81cb6fc74169e1336ce3a0b141d21827 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 10 May 2023 12:39:57 +0000
Subject: [PATCH] only define variable if it is not defined yet, fixes #2405
Closes #2405
Merge request studip/studip!1775
---
app/controllers/resources/room.php | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/app/controllers/resources/room.php b/app/controllers/resources/room.php
index 399de0b03c9..b3a77a1a4f6 100644
--- a/app/controllers/resources/room.php
+++ b/app/controllers/resources/room.php
@@ -198,8 +198,6 @@ class Resources_RoomController extends AuthenticatedController
$this->mode = $mode;
$this->show_form = false;
$this->parent_id = '';
- $this->category_id = '';
- $this->room = null;
$this->booking_plan_is_public = false;
$this->sort_position = '0';
@@ -287,9 +285,7 @@ class Resources_RoomController extends AuthenticatedController
if ($mode == 'add' || $mode == 'edit') {
//Process submitted form:
$this->parent_id = Request::get('parent_id');
- if ($mode == 'add') {
- $this->category_id = Request::get('category_id');
- }
+ $this->category_id = Request::get('category_id');
$this->name = Request::get('name');
$this->description = Request::get('description');
$this->requestable = Request::int('requestable');
--
GitLab