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
5fc3733f
Commit
5fc3733f
authored
Jun 12, 2014
by
Alexander Makarov
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3843 from umneeq/yii-widgets-menu-fix
Fix Menu bug when using `template` with `encodeLabel` => false
parents
b9db070a
c3cde232
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
CHANGELOG.md
framework/CHANGELOG.md
+1
-0
Menu.php
framework/widgets/Menu.php
+1
-3
No files found.
framework/CHANGELOG.md
View file @
5fc3733f
...
...
@@ -48,6 +48,7 @@ Yii Framework 2 Change Log
-
Bug: Fixed inconsistent return of
`\yii\console\Application::runAction()`
(samdark)
-
Bug: URL encoding for the route parameter added to
`\yii\web\UrlManager`
(klimov-paul)
-
Bug: Fixed the bug that requesting protected or private action methods would cause 500 error instead of 404 (qiangxue)
-
Bug #3843: Fixed Menu bug when using
`template`
with
`encodeLabel`
=> false (creocoder, umneeq)
-
Enh #2264:
`CookieCollection::has()`
will return false for expired or removed cookies (qiangxue)
-
Enh #2435:
`yii\db\IntegrityException`
is now thrown on database integrity errors instead of general
`yii\db\Exception`
(samdark)
-
Enh #2837: Error page now shows arguments in stack trace method calls (samdark)
...
...
framework/widgets/Menu.php
View file @
5fc3733f
...
...
@@ -255,9 +255,7 @@ class Menu extends Widget
if
(
!
isset
(
$item
[
'label'
]))
{
$item
[
'label'
]
=
''
;
}
if
(
$this
->
encodeLabels
)
{
$items
[
$i
][
'label'
]
=
Html
::
encode
(
$item
[
'label'
]);
}
$items
[
$i
][
'label'
]
=
$this
->
encodeLabels
?
Html
::
encode
(
$item
[
'label'
])
:
$item
[
'label'
];
$hasActiveChild
=
false
;
if
(
isset
(
$item
[
'items'
]))
{
$items
[
$i
][
'items'
]
=
$this
->
normalizeItems
(
$item
[
'items'
],
$hasActiveChild
);
...
...
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