diff options
| author | Simon Rettberg | 2017-12-01 13:42:04 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-12-01 13:42:04 +0100 |
| commit | 5393703f6e1485ddff94a50f63bcdd216ab629f4 (patch) | |
| tree | ce2db7130302bd4fb78b170e1fbd75496a1b4510 /modules-available/baseconfig | |
| parent | Merge remote-tracking branch 'origin/permission-manager' into permission-manager (diff) | |
| parent | [roomplanner] Sort already placed machines to the bottom (diff) | |
| download | slx-admin-5393703f6e1485ddff94a50f63bcdd216ab629f4.tar.gz slx-admin-5393703f6e1485ddff94a50f63bcdd216ab629f4.tar.xz slx-admin-5393703f6e1485ddff94a50f63bcdd216ab629f4.zip | |
Merge branch 'master' into permission-manager
Diffstat (limited to 'modules-available/baseconfig')
| -rw-r--r-- | modules-available/baseconfig/api.inc.php | 2 | ||||
| -rw-r--r-- | modules-available/baseconfig/page.inc.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/modules-available/baseconfig/api.inc.php b/modules-available/baseconfig/api.inc.php index 64204774..a4024c5e 100644 --- a/modules-available/baseconfig/api.inc.php +++ b/modules-available/baseconfig/api.inc.php @@ -172,12 +172,14 @@ if (Request::any('save') === 'true') { } else { echo "# Error saving config to $path\n"; } + echo "SLX_NOW='", time(), "'\n"; } } // Output to browser echo $lines; } else { // Only output to client + ConfigHolder::add('SLX_NOW', time(), PHP_INT_MAX); ConfigHolder::outputConfig(); } diff --git a/modules-available/baseconfig/page.inc.php b/modules-available/baseconfig/page.inc.php index bd9d6683..366a1238 100644 --- a/modules-available/baseconfig/page.inc.php +++ b/modules-available/baseconfig/page.inc.php @@ -178,7 +178,7 @@ class Page_BaseConfig extends Page $settings[$var['catid']]['settings'][$key]['displayvalue'] = $var['defaultvalue']; } if (!isset($settings[$var['catid']]['settings'][$key]['shadows'])) { - $settings[$var['catid']]['settings'][$key]['shadows'] = null; + $settings[$var['catid']]['settings'][$key]['shadows'] = isset($var['shadows']) ? $var['shadows'] : null; } //echo "<pre>"; //var_dump($settings[$var['catid']]['settings'][$key]); |