extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

only explode default value by comma, if we allow multiple values (otherwise defaults containing commas are never displayed, eg. addressbook link_title or fileas_type

Browse Source
This commit is contained in:
Ralf Becker 2010-11-10 09:32:57 +00:00
parent 3f137a1f64
commit f767742f67
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
preferences/inc/class.uisettings.inc.php
View File

@ -536,7 +536,6 @@
$extra = array('**NULL**' => lang('Users choice')); $extra = array('**NULL**' => lang('Users choice'));
break; break;
} }
#if ($extra) $values = $extra + $values;
if (is_array($extra)) $values = $extra + (is_array($values)?$values:array($values)); if (is_array($extra)) $values = $extra + (is_array($values)?$values:array($values));
$select = html::select($GLOBALS['type'].'['.$name.']',$default,$values,true); $select = html::select($GLOBALS['type'].'['.$name.']',$default,$values,true);
@ -558,8 +557,10 @@
$values += $val; $values += $val;
} }
} }
$default_value = $GLOBALS['egw']->preferences->default[$_appname][$name];
if ($multiple) $default_value = explode(',',$default_value);
$defs = array(); $defs = array();
foreach(explode(',',$GLOBALS['egw']->preferences->default[$_appname][$name]) as $def) foreach((array)$default_value as $def)
{ {
if ($values[$def]) $defs[] = $values[$def]; if ($values[$def]) $defs[] = $values[$def];
} }