extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-24 20:01:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use selectbox method to fix encoded options instead of own version, also handles numeric indexes.

Browse Source 
Fixes categories in wrong order in Resources.
This commit is contained in:
Nathan Gray 2015-08-18 18:41:35 +00:00
parent ecb972ca66
commit 34825b0171
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,17 +215,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
{ {
self::$request->sel_options[$select] = array(); self::$request->sel_options[$select] = array();
} }
foreach($_value as &$label) etemplate_widget_menupopup::fix_encoded_options($_value, TRUE);
{
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