Fixes #5143: yii\bootstrap\ActiveField::label() should not encode label if it is…

Fixes #5143: yii\bootstrap\ActiveField::label() should not encode label if it is explicitly specified. [skip ci]

Fixes #5143: yii\bootstrap\ActiveField::label() should not encode label if it is…
6c0dde6f · Qiang Xue · 982a27db · 6c0dde6f
Commit 6c0dde6f authored Sep 23, 2014 by Qiang Xue
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ActiveField.php extensions/bootstrap/ActiveField.php +2 -2

No files found.
--- a/extensions/bootstrap/ActiveField.php
+++ b/extensions/bootstrap/ActiveField.php
@@ -373,11 +373,11 @@ class ActiveField extends \yii\widgets\ActiveField
                unset($options['label']);
            } else {
                $attribute = Html::getAttributeName($this->attribute);
-                $label = $this->model->getAttributeLabel($attribute);
+                $label = Html::encode($this->model->getAttributeLabel($attribute));
            }
        }
        $this->parts['{beginLabel}'] = Html::beginTag('label', $options);
        $this->parts['{endLabel}'] = Html::endTag('label');
-        $this->parts['{labelTitle}'] = Html::encode($label);
+        $this->parts['{labelTitle}'] = $label;
    }
 }