diff options
| author | Simon Rettberg | 2019-01-15 14:28:05 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-01-15 14:28:05 +0100 |
| commit | a08d21462310c03c1902e43988c6159cea5b4965 (patch) | |
| tree | 8a510907d519ad7c06f9e756f165dfc93d10bdf7 /modules-available/locationinfo/inc/infopanel.inc.php | |
| parent | [serversetup-bwlp] Update translations (diff) | |
| parent | [locationinfo] set roomplanner default on false for existing panels (diff) | |
| download | slx-admin-a08d21462310c03c1902e43988c6159cea5b4965.tar.gz slx-admin-a08d21462310c03c1902e43988c6159cea5b4965.tar.xz slx-admin-a08d21462310c03c1902e43988c6159cea5b4965.zip | |
Merge branch 'master' into ipxe
Diffstat (limited to 'modules-available/locationinfo/inc/infopanel.inc.php')
| -rw-r--r-- | modules-available/locationinfo/inc/infopanel.inc.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules-available/locationinfo/inc/infopanel.inc.php b/modules-available/locationinfo/inc/infopanel.inc.php index 918030f0..fdc253f0 100644 --- a/modules-available/locationinfo/inc/infopanel.inc.php +++ b/modules-available/locationinfo/inc/infopanel.inc.php @@ -37,6 +37,9 @@ class InfoPanel $overrides = $json['overrides']; } unset($json['overrides']); + if (!isset($json['roomplanner'])) { + $config['roomplanner'] = false; + } $config = $json + $config; } } |