tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IcingaObject, ..WithSettings: fix Basket-related.. 

...problems
This commit is contained in:
Thomas Gelf 2018-11-26 00:12:13 +01:00
parent 7926d558ba
commit b644a7c6a7
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/Director/Data/Db/DbObjectWithSettings.php
View File

@ -44,7 +44,12 @@ abstract class DbObjectWithSettings extends DbObject
public function setSettings($settings)
{
$this->settings = (array) $settings;
$settings = (array) $settings;
ksort($settings);
if ($settings !== $this->settings) {
$this->settings = $settings;
$this->hasBeenModified = true;
}
return $this;
}

7
library/Director/Objects/IcingaObject.php
View File

@ -1086,16 +1086,17 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
public function getVars()
{
$vars = (object) array();
$vars = [];
foreach ($this->vars() as $key => $var) {
if ($var->hasBeenDeleted()) {
continue;
}
$vars->$key = $var->getValue();
$vars[$key] = $var->getValue();
}
ksort($vars);
return $vars;
return (object) $vars;
}
/**