Avoid warning if selectbox has no options

This commit is contained in:
Nathan Gray 2013-02-27 17:57:23 +00:00
parent 50c63d6a9e
commit 7d07d51265

View File

@ -144,15 +144,18 @@ class etemplate_widget_menupopup extends etemplate_widget
// Make sure  s, etc. are properly encoded when sent, and not double-encoded // Make sure  s, etc. are properly encoded when sent, and not double-encoded
$options = (self::$request->sel_options[$form_name] ? $form_name : $this->id); $options = (self::$request->sel_options[$form_name] ? $form_name : $this->id);
foreach(self::$request->sel_options[$options] as &$label) if(is_array(self::$request->sel_options[$options]))
{ {
if(!is_array($label)) foreach(self::$request->sel_options[$options] as &$label)
{ {
$label = html_entity_decode($label, ENT_NOQUOTES,'utf-8'); if(!is_array($label))
} {
elseif($label['label']) $label = html_entity_decode($label, ENT_NOQUOTES,'utf-8');
{ }
$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES,'utf-8'); elseif($label['label'])
{
$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES,'utf-8');
}
} }
} }
} }