extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle entities in selects other than cat_id

Browse Source
This commit is contained in:
Nathan Gray 2013-07-08 21:16:45 +00:00
parent 55dc847f95
commit 13e593a7f1
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etemplate/inc/class.etemplate_widget_nextmatch.inc.php
View File

@ -195,7 +195,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
self::$request->sel_options[$form_name]['favorite']['group'] = array('all' => lang('All users')) + self::$request->sel_options[$form_name]['favorite']['group'] = array('all' => lang('All users')) +
etemplate_widget_menupopup::typeOptions('select-account',',groups'); etemplate_widget_menupopup::typeOptions('select-account',',groups');
} }
foreach($value as $name => $_value) foreach($value as $name => &$_value)
{ {
if(strpos($name, 'options-') !== false && $_value) if(strpos($name, 'options-') !== false && $_value)
{ {
@ -204,6 +204,17 @@ class etemplate_widget_nextmatch extends etemplate_widget
{ {
self::$request->sel_options[$select] = array(); 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; self::$request->sel_options[$select] += $_value;
// The client doesn't need them in content, but we can't unset them because // 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 // some apps don't send them on re-load, pulling them from the session