Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Y
yii2bootstrap
Project
Project
Details
Activity
Releases
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
yii2bootstrap
Commits
898682b0
Commit
898682b0
authored
May 10, 2015
by
Qiang Xue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Using `Json::htmlEncode()` for safer JSON data encoding in HTML code
parent
032ac869
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
CHANGELOG.md
CHANGELOG.md
+1
-0
Widget.php
Widget.php
+1
-1
No files found.
CHANGELOG.md
View file @
898682b0
...
@@ -8,6 +8,7 @@ Yii Framework 2 bootstrap extension Change Log
...
@@ -8,6 +8,7 @@ Yii Framework 2 bootstrap extension Change Log
-
Bug #5984:
`yii\bootstrap\Activefield::checkbox()`
caused browser to link label to the wrong input (cebe)
-
Bug #5984:
`yii\bootstrap\Activefield::checkbox()`
caused browser to link label to the wrong input (cebe)
-
Bug #7894: Fixed incorrect URL config processing at
`yii\bootstrap\Nav::items`
if route element is not a first one (nkovacs, klimov-paul)
-
Bug #7894: Fixed incorrect URL config processing at
`yii\bootstrap\Nav::items`
if route element is not a first one (nkovacs, klimov-paul)
-
Bug #8231: Configuration of Alert, ButtonDropdown, Modal widget where not preserved when used multiple times (cebe, idMolotov)
-
Bug #8231: Configuration of Alert, ButtonDropdown, Modal widget where not preserved when used multiple times (cebe, idMolotov)
-
Bug (CVE-2015-3397): Using
`Json::htmlEncode()`
for safer JSON data encoding in HTML code (samdark, Tomasz Tokarski)
-
Enh #29: Added support to list-groups for Collapse class (pana1990, skullcrasher)
-
Enh #29: Added support to list-groups for Collapse class (pana1990, skullcrasher)
-
Enh #2546: Added
`visible`
option to
`yii\bootstrap\ButtonGroup::$buttons`
(samdark, lukBarros)
-
Enh #2546: Added
`visible`
option to
`yii\bootstrap\ButtonGroup::$buttons`
(samdark, lukBarros)
-
Enh #7633: Added
`ActionColumn::$buttonOptions`
for defining HTML options to be added to the default buttons (cebe)
-
Enh #7633: Added
`ActionColumn::$buttonOptions`
for defining HTML options to be added to the default buttons (cebe)
...
...
Widget.php
View file @
898682b0
...
@@ -66,7 +66,7 @@ class Widget extends \yii\base\Widget
...
@@ -66,7 +66,7 @@ class Widget extends \yii\base\Widget
$id
=
$this
->
options
[
'id'
];
$id
=
$this
->
options
[
'id'
];
if
(
$this
->
clientOptions
!==
false
)
{
if
(
$this
->
clientOptions
!==
false
)
{
$options
=
empty
(
$this
->
clientOptions
)
?
''
:
Json
::
e
ncode
(
$this
->
clientOptions
);
$options
=
empty
(
$this
->
clientOptions
)
?
''
:
Json
::
htmlE
ncode
(
$this
->
clientOptions
);
$js
=
"jQuery('#
$id
').
$name
(
$options
);"
;
$js
=
"jQuery('#
$id
').
$name
(
$options
);"
;
$view
->
registerJs
(
$js
);
$view
->
registerJs
(
$js
);
}
}
...
...
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