From bb6445bf676b4a480fd050d482bab1238089fa5a Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 21 Feb 2023 12:20:40 +0000
Subject: [PATCH] always provide default values, fixes #2203
Closes #2203
Merge request studip/studip!1435
---
app/controllers/profilemodules.php | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/app/controllers/profilemodules.php b/app/controllers/profilemodules.php
index 607a798009e..201c4ffaab2 100644
--- a/app/controllers/profilemodules.php
+++ b/app/controllers/profilemodules.php
@@ -54,16 +54,14 @@ class ProfileModulesController extends AuthenticatedController
private function getConfig()
{
- $config = $GLOBALS['user']->cfg->PLUS_SETTINGS;
- if (!$config || !isset($config['profile_plus'])) {
- return [
- 'view' => 'openall',
- 'displaystyle' => 'category',
- 'hidden' => [],
- ];
- }
+ $default = [
+ 'view' => 'openall',
+ 'displaystyle' => 'category',
+ 'hidden' => [],
+ ];
- return array_merge(['hidden' => []], $config['profile_plus']);
+ $config = $GLOBALS['user']->cfg->PLUS_SETTINGS;
+ return array_merge($default, $config['profile_plus'] ?? []);
}
private function storeConfig(array $config)
--
GitLab