extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 04:11:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

forgot to handle empty-label value

Browse Source
This commit is contained in:
Ralf Becker 2014-04-18 08:32:13 +00:00
parent dac15dbded
commit e526c42e3d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,8 +86,12 @@ class etemplate_widget_menupopup extends etemplate_widget
$allowed = self::selOptions($form_name, true); // true = return array of option-values $allowed = self::selOptions($form_name, true); // true = return array of option-values
if (!$this->attrs['multiple'] || !($this->attrs['options'] > 1)) $allowed[] = ''; if (!$this->attrs['multiple'] || !($this->attrs['options'] > 1)) $allowed[] = '';
foreach((array) $value as $val) foreach((array) $value as $val)
{ {
// handle empty-label for all widget types
if ((string)$val === '' && in_array('', $allowed)) continue;
switch ($widget_type) switch ($widget_type)
{ {
case 'select-account': // validate accounts independent of options know to server case 'select-account': // validate accounts independent of options know to server
@ -108,10 +112,6 @@ class etemplate_widget_menupopup extends etemplate_widget
break; break;
default: default:
// array_key_exists() (used below) is inconsistent in how it handles empty/false
// It needs a string or integer.
if(!$val && $val !== 0) $val = '';
if(!in_array($val, $allowed)) if(!in_array($val, $allowed))
{ {
self::set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!", $val, implode("','",$allowed)),''); self::set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!", $val, implode("','",$allowed)),'');