mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 12:20:44 +02:00
Code Issues Releases Wiki Activity

Form Handler Fixed drop-down 'empty' value check.

Browse Source
This commit is contained in:
Cameron
2018-05-23 18:47:34 -07:00
parent aa53328ef0
commit 0c1ab45835
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_handlers/form_handler.php
View File

@@ -874,7 +874,7 @@ class e_form
$min = " min='".varsettrue($options['min'], '0')."'"; $min = " min='".varsettrue($options['min'], '0')."'";
$max = isset($options['max']) ? " max='".$options['max']."'" : ''; $max = isset($options['max']) ? " max='".$options['max']."'" : '';
if (varsettrue($options['pattern'])) if (!empty($options['pattern']))
{ {
$pattern = ' pattern="'.trim($options['pattern']).'"'; $pattern = ' pattern="'.trim($options['pattern']).'"';
} }
@@ -925,7 +925,7 @@ class e_form
if(THEME_LEGACY === false) if(THEME_LEGACY === false)
{ {
// return "<input pattern='[0-9]*' type='number' name='{$name}' value='{$value}' {$mlength} {$step} {$min} {$max} ".$this->get_attributes($options, $name)." />"; // return "<input pattern='[0-9]*' type='number' name='{$name}' value='{$value}' {$mlength} {$step} {$min} {$max} ".$this->get_attributes($options, $name)." />";
return "<input type='number' name='{$name}' {$min} {$max} {$step} value='{$value}' {$pattern}".$this->get_attributes($options, $name)." />"; return "<input type='number' name='{$name}' {$min} {$max} {$step} value='{$value}' ".$this->get_attributes($options, $name)." />";
} }
return $this->text($name, $value, $maxlength, $options); return $this->text($name, $value, $maxlength, $options);
@@ -5723,15 +5723,13 @@ class e_form
$eloptions = vartrue($parms['__options'], array()); $eloptions = vartrue($parms['__options'], array());
} }
$value = (isset($eloptions['empty']) && empty($value)) ? $eloptions['empty'] : $value; $value = (isset($eloptions['empty']) && ($value === null)) ? $eloptions['empty'] : $value;
if(is_string($eloptions)) parse_str($eloptions, $eloptions); if(is_string($eloptions)) parse_str($eloptions, $eloptions);
if($attributes['type'] === 'comma') $eloptions['multiple'] = true; if($attributes['type'] === 'comma') $eloptions['multiple'] = true;
unset($parms['__options']); unset($parms['__options']);
if(vartrue($eloptions['multiple']) && !is_array($value)) $value = explode(',', $value); if(vartrue($eloptions['multiple']) && !is_array($value)) $value = explode(',', $value);
// Allow Ajax API. // Allow Ajax API.
if(!empty($ajaxParms)) if(!empty($ajaxParms))
{ {