Commit 866214e7 by Qiang Xue

Fixes #6018: When setting the `encode` option via…

Fixes #6018: When setting the `encode` option via `yii\widgets\ActiveRecord::errorOptions`, it works the other way around [skip ci]
parent a26d07ce
...@@ -25,6 +25,7 @@ Yii Framework 2 Change Log ...@@ -25,6 +25,7 @@ Yii Framework 2 Change Log
- Bug #5893: `yii\helpers\ArrayHelper::toArray()` now applies `$properties` parameter for converting descending objects in recursive calls (otsec) - Bug #5893: `yii\helpers\ArrayHelper::toArray()` now applies `$properties` parameter for converting descending objects in recursive calls (otsec)
- Bug #5925: `ArrayHelper::htmlEncode()` does not work properly when the value being encoded is a nested array (tebazil) - Bug #5925: `ArrayHelper::htmlEncode()` does not work properly when the value being encoded is a nested array (tebazil)
- Bug #5997: The same message may be exported twice to log targets (klimov-paul) - Bug #5997: The same message may be exported twice to log targets (klimov-paul)
- Bug #6018: When setting the `encode` option via `yii\widgets\ActiveRecord::errorOptions`, it works the other way around (stanishevsky, qiangxue)
- Bug: Gii console command help information does not contain global options (qiangxue) - Bug: Gii console command help information does not contain global options (qiangxue)
- Bug: `yii\web\UrlRule` was unable to create URLs for rules containing unicode characters (samdark) - Bug: `yii\web\UrlRule` was unable to create URLs for rules containing unicode characters (samdark)
- Enh #4181: Added `yii\bootstrap\Modal::$headerOptions` and `yii\bootstrap\Modal::$footerOptions` (tuxoff, samdark) - Enh #4181: Added `yii\bootstrap\Modal::$headerOptions` and `yii\bootstrap\Modal::$footerOptions` (tuxoff, samdark)
......
...@@ -737,7 +737,7 @@ class ActiveField extends Component ...@@ -737,7 +737,7 @@ class ActiveField extends Component
$options['error'] = isset($this->errorOptions['tag']) ? $this->errorOptions['tag'] : 'span'; $options['error'] = isset($this->errorOptions['tag']) ? $this->errorOptions['tag'] : 'span';
} }
$options['encodeError'] = !isset($this->errorOptions['encode']) || !$this->errorOptions['encode']; $options['encodeError'] = !isset($this->errorOptions['encode']) || $this->errorOptions['encode'];
if ($enableAjaxValidation) { if ($enableAjaxValidation) {
$options['enableAjaxValidation'] = true; $options['enableAjaxValidation'] = true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment