diff options
| author | Jannik Schönartz | 2017-11-30 12:59:49 +0100 |
|---|---|---|
| committer | Jannik Schönartz | 2017-11-30 12:59:49 +0100 |
| commit | e88a313149cb39e187baf74a2fc18cc7c5d86d81 (patch) | |
| tree | f2019cc85e1ff50d0708cb4828357b2d7e6f1d7a /modules-available/locationinfo/inc/infopanel.inc.php | |
| parent | [inc/Database] Do EXPLAIN SELECT at shutdown so we don't interfere with SQL_C... (diff) | |
| download | slx-admin-e88a313149cb39e187baf74a2fc18cc7c5d86d81.tar.gz slx-admin-e88a313149cb39e187baf74a2fc18cc7c5d86d81.tar.xz slx-admin-e88a313149cb39e187baf74a2fc18cc7c5d86d81.zip | |
[locationinfo] Reworked summary-panel to the new panel uuid stuff.
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 c612e518..dacf860f 100644 --- a/modules-available/locationinfo/inc/infopanel.inc.php +++ b/modules-available/locationinfo/inc/infopanel.inc.php @@ -20,6 +20,7 @@ class InfoPanel } if ($panel['paneltype'] === 'URL') { + // Shortcut for URL redirect $config = json_decode($panel['panelconfig'], true); return $panel['paneltype']; } @@ -31,6 +32,7 @@ class InfoPanel if (!empty($panel['panelconfig'])) { $json = json_decode($panel['panelconfig'], true); if (is_array($json)) { + // Put location-specific overrides in separate variable for later use if (isset($json['overrides']) && is_array($json['overrides'])) { $overrides = $json['overrides']; } @@ -48,6 +50,7 @@ class InfoPanel 'id' => $lid, 'name' => isset($locations[$lid]) ? $locations[$lid]['locationname'] : 'noname00.pas', ); + // Now apply any overrides from above if (isset($overrides[$lid]) && is_array($overrides[$lid])) { $config['locations'][$lid]['config'] = $overrides[$lid]; } |