Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Rotua Panjaitan
yii2
Commits
866214e7
Commit
866214e7
authored
Nov 11, 2014
by
Qiang Xue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
CHANGELOG.md
framework/CHANGELOG.md
+1
-0
ActiveField.php
framework/widgets/ActiveField.php
+1
-1
No files found.
framework/CHANGELOG.md
View file @
866214e7
...
...
@@ -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 #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 #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:
`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)
...
...
framework/widgets/ActiveField.php
View file @
866214e7
...
...
@@ -737,7 +737,7 @@ class ActiveField extends Component
$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
)
{
$options
[
'enableAjaxValidation'
]
=
true
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment