holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for base of select name in root of sel_options if none found specificaly for that name

Browse Source
This commit is contained in:
Nathan Gray 2012-04-24 23:00:05 +00:00
parent 2ed29276f6
commit 92cd8e15bd
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etemplate/inc/class.etemplate_widget_menupopup.inc.php
View File

@ -155,13 +155,17 @@ class etemplate_widget_menupopup extends etemplate_widget
public static function selOptions($name)
{
$options = array();
// Check for exact match on name
if (isset(self::$request->sel_options[$name]) && is_array(self::$request->sel_options[$name]))
{
$options += self::$request->sel_options[$name];
}
else
// Check for base of name in root of sel_options
if(!$options)
{
$name_parts = explode('[',str_replace(']','',$name));
$name_parts = explode('[',str_replace(array('[',']',']'),array('['),$name));
if (count($name_parts))
{
$org_name = $name_parts[count($name_parts)-1];
@ -175,6 +179,8 @@ class etemplate_widget_menupopup extends etemplate_widget
}
}
}
// Check for options-$name in content
if (isset(self::$request->content['options-'.$name]))
{
$options += self::$request->content['options-'.$name];