Browse Source

Merge pull request #1798 from zhuravljov/patch-1

Fixed label attributes in BaseHtml
tags/2.0.0-beta
Alexander Makarov 11 years ago
parent
commit
c4ff009e0f
  1. 2
      framework/yii/helpers/BaseHtml.php

2
framework/yii/helpers/BaseHtml.php

@ -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);
} }

Loading…
Cancel
Save