extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-25 22:51:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix defaults showing "Array" instead of array values

Browse Source
This commit is contained in:
Nathan Gray 2013-11-26 16:50:59 +00:00
parent fe5650e144
commit 127663af77
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
preferences/inc/class.preferences_settings.inc.php
View File

@ -372,14 +372,18 @@ class preferences_settings
$GLOBALS['egw']->preferences->group[$appname][$setting['name']] : $GLOBALS['egw']->preferences->group[$appname][$setting['name']] :
$GLOBALS['egw']->preferences->default[$appname][$setting['name']]; $GLOBALS['egw']->preferences->default[$appname][$setting['name']];
if (isset($setting['values']) && (string)$setting['values'][$default] !== '') if (isset($setting['values']) && !is_array($setting['values'][$default]) && (string)$setting['values'][$default] !== '')
{ {
$default = $setting['values'][$default]; $default = $setting['values'][$default];
} }
elseif (strpos($default, ',') !== false) elseif (strpos($default, ',') !== false)
{
$default = explode(',',$default);
}
if(is_array($default))
{ {
$values = array(); $values = array();
foreach(explode(',', $default) as $value) foreach($default as $value)
{ {
if (isset($setting['values'][$value])) $values[] = $setting['values'][$value]; if (isset($setting['values'][$value])) $values[] = $setting['values'][$value];
} }