mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 00:54:15 +01:00
Handle entities in selects other than cat_id
This commit is contained in:
parent
55dc847f95
commit
13e593a7f1
@ -195,7 +195,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
|
||||
self::$request->sel_options[$form_name]['favorite']['group'] = array('all' => lang('All users')) +
|
||||
etemplate_widget_menupopup::typeOptions('select-account',',groups');
|
||||
}
|
||||
foreach($value as $name => $_value)
|
||||
foreach($value as $name => &$_value)
|
||||
{
|
||||
if(strpos($name, 'options-') !== false && $_value)
|
||||
{
|
||||
@ -204,6 +204,17 @@ class etemplate_widget_nextmatch extends etemplate_widget
|
||||
{
|
||||
self::$request->sel_options[$select] = array();
|
||||
}
|
||||
foreach($_value as &$label)
|
||||
{
|
||||
if(!is_array($label))
|
||||
{
|
||||
$label = html_entity_decode($label, ENT_NOQUOTES,'utf-8');
|
||||
}
|
||||
elseif($label['label'])
|
||||
{
|
||||
$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES,'utf-8');
|
||||
}
|
||||
}
|
||||
self::$request->sel_options[$select] += $_value;
|
||||
// The client doesn't need them in content, but we can't unset them because
|
||||
// some apps don't send them on re-load, pulling them from the session
|
||||
|
Loading…
Reference in New Issue
Block a user