maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix Settings::Flush(), thx to Ithariel

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-12-16 10:17:48 +01:00
parent f9101f880b
commit 4502f7ddf5
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/classes/settings/class.Settings.php
View File

@@ -86,6 +86,7 @@ class Settings {
while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) { while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
self::$_data[$row['settinggroup']][$row['varname']] = $row['value']; self::$_data[$row['settinggroup']][$row['varname']] = $row['value'];
} }
return true;
} }
/** /**
@@ -161,10 +162,16 @@ class Settings {
if ($instant_save) { if ($instant_save) {
$this->_storeSetting($sstr[0], $sstr[1], $value); $this->_storeSetting($sstr[0], $sstr[1], $value);
} else { } else {
if (!is_array(self::$_data[$sstr[0]])) { // set temporary data for usage
if (!isset(self::$_data[$sstr[0]]) || !is_array(self::$_data[$sstr[0]])) {
self::$_data[$sstr[0]] = array(); self::$_data[$sstr[0]] = array();
} }
self::$_data[$sstr[0]][$sstr[1]] = $value; self::$_data[$sstr[0]][$sstr[1]] = $value;
// set update-data when invoking Flush()
if (!isset(self::$_updatedata[$sstr[0]]) || !is_array(self::$_updatedata[$sstr[0]])) {
self::$_updatedata[$sstr[0]] = array();
}
self::$_updatedata[$sstr[0]][$sstr[1]] = $value;
} }
return true; return true;
} }
@@ -223,8 +230,9 @@ class Settings {
// now empty the array // now empty the array
self::$_updatedata = array(); self::$_updatedata = array();
// re-read in all settings // re-read in all settings
$this->_readSettings(); return $this->_readSettings();
} }
return false;
} }
/** /**