php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-04 06:37:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1798 from zhuravljov/patch-1

Browse Source 
Fixed label attributes in BaseHtml
This commit is contained in:
Alexander Makarov
2014-01-06 03:16:20 -08:00
parent 4bbd844b23 2daa5e9135
commit c4ff009e0f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/yii/helpers/BaseHtml.php
View File

@ -961,9 +961,9 @@ class BaseHtml
*/ */
public static function activeLabel($model, $attribute, $options = []) public static function activeLabel($model, $attribute, $options = [])
{ {
$for = array_key_exists('for', $options) ? $options['for'] : static::getInputId($model, $attribute);
$attribute = static::getAttributeName($attribute); $attribute = static::getAttributeName($attribute);
$label = isset($options['label']) ? $options['label'] : static::encode($model->getAttributeLabel($attribute)); $label = isset($options['label']) ? $options['label'] : static::encode($model->getAttributeLabel($attribute));
$for = array_key_exists('for', $options) ? $options['for'] : static::getInputId($model, $attribute);
unset($options['label'], $options['for']); unset($options['label'], $options['for']);
return static::label($label, $for, $options); return static::label($label, $for, $options);
} }