smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-05 19:04:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix html_options plugin did not handle null- and object values properly (Issue #49, Forum Topic 20049)

Browse Source
This commit is contained in:
rodneyrehm
2011-10-05 18:51:10 +00:00
parent 1e48394ed3
commit 3825ef336c
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -3,6 +3,7 @@
- bugfix of problem introduced with r4342 by replacing strlen() with isset() - bugfix of problem introduced with r4342 by replacing strlen() with isset()
- add environment configuration issue with mbstring.func_overload Smarty cannot compensate for (Issue #45) - add environment configuration issue with mbstring.func_overload Smarty cannot compensate for (Issue #45)
- bugfix nofilter tag option did not disable default modifier - bugfix nofilter tag option did not disable default modifier
- bugfix html_options plugin did not handle null- and object values properly (Issue #49, Forum Topic 20049)
04.10.2011 04.10.2011
- bugfix assign() in plugins called in subtemplates did change value also in parent template - bugfix assign() in plugins called in subtemplates did change value also in parent template

35
libs/plugins/function.html_options.php
View File

@@ -66,9 +66,28 @@ function smarty_function_html_options($params, $template)
case 'selected': case 'selected':
if (is_array($_val)) { if (is_array($_val)) {
$selected = array_flip(array_map('strval', array_values((array)$_val))); $selected = array();
foreach ($_val as $_sel) {
if (is_object($_sel)) {
if (method_exists($_sel, "__toString")) {
$selected = smarty_function_escape_special_chars((string) $_sel->__toString());
} else {
trigger_error("html_options: selected attribute contains an object of class '". get_class($_sel) ."' without __toString() method", E_USER_NOTICE);
continue;
}
} else {
$_sel = smarty_function_escape_special_chars((string) $_sel);
}
$selected[$_sel] = true;
}
} elseif (is_object($_val)) {
if (method_exists($_val, "__toString")) {
$selected = smarty_function_escape_special_chars((string) $_val->__toString());
} else {
trigger_error("html_options: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE);
}
} else { } else {
$selected = $_val; $selected = smarty_function_escape_special_chars((string) $_val);
} }
break; break;
@@ -82,9 +101,10 @@ function smarty_function_html_options($params, $template)
} }
} }
if (!isset($options) && !isset($values)) if (!isset($options) && !isset($values)) {
/* raise error here? */
return ''; return '';
/* raise error here? */ }
$_html_result = ''; $_html_result = '';
$_idx = 0; $_idx = 0;
@@ -112,12 +132,13 @@ function smarty_function_html_options($params, $template)
function smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, &$idx) function smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, &$idx)
{ {
if (!is_array($value)) { if (!is_array($value)) {
$_html_result = '<option value="' . smarty_function_escape_special_chars($key) . '"'; $_key = smarty_function_escape_special_chars($key);
$_html_result = '<option value="' . $_key . '"';
if (is_array($selected)) { if (is_array($selected)) {
if (isset($selected[(string) $key])) { if (isset($selected[$_key])) {
$_html_result .= ' selected="selected"'; $_html_result .= ' selected="selected"';
} }
} elseif ($key == $selected) { } elseif ($_key === $selected) {
$_html_result .= ' selected="selected"'; $_html_result .= ' selected="selected"';
} }
$_html_class = !empty($class) ? ' class="'.$class.' option"' : ''; $_html_class = !empty($class) ? ' class="'.$class.' option"' : '';