php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-20 18:32:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure correct type.

Browse Source
This commit is contained in:
Qiang Xue
2013-07-24 08:02:19 -04:00
parent 3d10cb1852
commit 39817de330
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/yii/helpers/HtmlBase.php
View File

@ -553,7 +553,7 @@ class HtmlBase
*/ */
public static function radio($name, $checked = false, $options = array()) public static function radio($name, $checked = false, $options = array())
{ {
$options['checked'] = $checked; $options['checked'] = (boolean)$checked;
$value = array_key_exists('value', $options) ? $options['value'] : '1'; $value = array_key_exists('value', $options) ? $options['value'] : '1';
if (isset($options['uncheck'])) { if (isset($options['uncheck'])) {
// add a hidden field so that if the radio button is not selected, it still submits a value // add a hidden field so that if the radio button is not selected, it still submits a value
@ -582,7 +582,7 @@ class HtmlBase
*/ */
public static function checkbox($name, $checked = false, $options = array()) public static function checkbox($name, $checked = false, $options = array())
{ {
$options['checked'] = $checked; $options['checked'] = (boolean)$checked;
$value = array_key_exists('value', $options) ? $options['value'] : '1'; $value = array_key_exists('value', $options) ? $options['value'] : '1';
if (isset($options['uncheck'])) { if (isset($options['uncheck'])) {
// add a hidden field so that if the checkbox is not selected, it still submits a value // add a hidden field so that if the checkbox is not selected, it still submits a value
@ -1288,7 +1288,7 @@ class HtmlBase
$attrs = isset($options[$key]) ? $options[$key] : array(); $attrs = isset($options[$key]) ? $options[$key] : array();
$attrs['value'] = (string)$key; $attrs['value'] = (string)$key;
$attrs['selected'] = $selection !== null && $attrs['selected'] = $selection !== null &&
(!is_array($selection) && !strcmp($key, $selection) (!is_array($selection) && !strcmp($key, $selection)
|| is_array($selection) && in_array($key, $selection)); || is_array($selection) && in_array($key, $selection));
$lines[] = static::tag('option', str_replace(' ', ' ', static::encode($value)), $attrs); $lines[] = static::tag('option', str_replace(' ', ' ', static::encode($value)), $attrs);
} }