mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 14:41:29 +01:00
check if we have a default/forced value from the settings hook,
which is NOT stored as default currently --> store it as default, to allow to propagate defaults to existing installations
This commit is contained in:
parent
8e98f6cea3
commit
0ca8c89bdd
@ -119,9 +119,28 @@
|
|||||||
$this->settings = array_merge($this->settings,$GLOBALS['settings']);
|
$this->settings = array_merge($this->settings,$GLOBALS['settings']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// check if we have a default/forced value from the settings hook,
|
||||||
|
// which is NOT stored as default currently
|
||||||
|
// --> store it as default, to allow to propagate defaults to existing installations
|
||||||
|
if ($appname == 'preferences') $appname = 'common';
|
||||||
|
foreach ($this->settings as $name => $data)
|
||||||
|
{
|
||||||
|
if ((string)$GLOBALS['egw']->preferences->default[$appname][$name] === '' &&
|
||||||
|
((string)$data['default'] !== '' || (string)$data['forced'] !== ''))
|
||||||
|
{
|
||||||
|
$default = (string)$data['forced'] !== '' ? $data['forced'] : $data['default'];
|
||||||
|
//echo "<p>".__METHOD__."($appname) $this->appname/$appname/$name=$default NOT yet set!</p>\n";
|
||||||
|
$GLOBALS['egw']->preferences->default[$appname][$name] = $default;
|
||||||
|
$need_update = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($need_update)
|
||||||
|
{
|
||||||
|
$GLOBALS['egw']->preferences->save_repository(false,'default',true);
|
||||||
|
}
|
||||||
if($this->debug)
|
if($this->debug)
|
||||||
{
|
{
|
||||||
// _debug_array($this->settings);
|
_debug_array($this->settings);
|
||||||
}
|
}
|
||||||
return True;
|
return True;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user