diff options
| author | Simon Rettberg | 2018-12-12 14:00:35 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2018-12-12 14:00:35 +0100 |
| commit | f14c04f3af8936f07d0efaa292ce0ea92981b1f6 (patch) | |
| tree | e1275d80fdced4f0b3d652277863150f756785a3 /modules-available/locationinfo/inc/infopanel.inc.php | |
| parent | [serversetup-bwlp] Simplify permissions (diff) | |
| parent | [dozmod] ldapfilters: Fix list (attr/value) (diff) | |
| download | slx-admin-f14c04f3af8936f07d0efaa292ce0ea92981b1f6.tar.gz slx-admin-f14c04f3af8936f07d0efaa292ce0ea92981b1f6.tar.xz slx-admin-f14c04f3af8936f07d0efaa292ce0ea92981b1f6.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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/modules-available/locationinfo/inc/infopanel.inc.php b/modules-available/locationinfo/inc/infopanel.inc.php index edeb9ccf..918030f0 100644 --- a/modules-available/locationinfo/inc/infopanel.inc.php +++ b/modules-available/locationinfo/inc/infopanel.inc.php @@ -75,6 +75,8 @@ class InfoPanel } /** + * {"language":"de","mode":1,"vertical":true,"eco":false,"scaledaysauto":true,"daystoshow":7,"rotation":0,"scale":56,"switchtime":10,"calupdate":120,"roomupdate":20, + * "overrides": { "12" : { "mode":4} } * Gets the location info of the given locations. * Append to passed array which is expected to * map location ids to properties of that location. @@ -157,6 +159,8 @@ class InfoPanel // Iterate over the locations we're actually interested in $locations = Location::getLocationsAssoc(); foreach ($idList as $locationId) { + if (empty($locationId)) + continue; // Start checking at actual location... $currentId = $locationId; while ($currentId !== 0) { @@ -175,6 +179,8 @@ class InfoPanel } } // Keep trying with parent + if (!isset($locations[$currentId])) + break; $currentId = $locations[$currentId]['parentlocationid']; } } |