From d36249e66c4b5abf94d0b2bb0e70a3cb77888a38 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 23 Nov 2017 15:16:30 +0100
Subject: [baseconfig] Fix shadow variable handling on unset vars

---
 modules-available/baseconfig/page.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules-available/baseconfig')

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]);
-- 
cgit v1.2.3-55-g7522


From c9e262af478be835b25d2c8504a9824e3d4ab878 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 27 Nov 2017 17:09:10 +0100
Subject: [baseconfig] Add current unix timestamp to config

---
 modules-available/baseconfig/api.inc.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'modules-available/baseconfig')

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();
 }
 
-- 
cgit v1.2.3-55-g7522