holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"fixed empty settings in infolog, reported on user-list"

Browse Source
This commit is contained in:
Ralf Becker 2009-11-18 09:24:15 +00:00
parent 0e976fc169
commit 3417bc8115
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
preferences/inc/class.bosettings.inc.php
View File

@ -72,11 +72,21 @@
$GLOBALS['egw']->translation->add_app('preferences'); // we need the prefs translations too
}
if(!$GLOBALS['egw']->hooks->single('settings',$this->appname))
// calling the settings hook
$settings = $GLOBALS['egw']->hooks->single('settings',$this->appname);
// it either returns the settings or save it in $GLOBALS['settings'] (deprecated!)
if (isset($settings) && is_array($settings) && $settings)
{
return False;
$this->settings = array_merge($this->settings,$settings);
}
elseif(isset($GLOBALS['settings']) && is_array($GLOBALS['settings']) && $GLOBALS['settings'])
{
$this->settings = array_merge($this->settings,$GLOBALS['settings']);
}
else
{
return False; // no settings returned
}
$this->settings = array_merge($this->settings,$GLOBALS['settings']);
/* Remove ui-only settings */
if($this->xmlrpc)