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
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
PSDI Army
yii2
Commits
79f9f85f
Commit
79f9f85f
authored
Jun 24, 2014
by
Alexander Makarov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #4024, Fixes #4028
parent
dde695cd
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
Tabs.php
extensions/bootstrap/Tabs.php
+1
-1
Menu.php
framework/widgets/Menu.php
+1
-1
No files found.
extensions/bootstrap/Tabs.php
View file @
79f9f85f
...
...
@@ -138,7 +138,7 @@ class Tabs extends Widget
if
(
!
isset
(
$item
[
'label'
]))
{
throw
new
InvalidConfigException
(
"The 'label' option is required."
);
}
$encodeLabel
=
$this
->
encodeLabels
||
isset
(
$item
[
'encode'
])
&&
$item
[
'encode'
]
===
true
;
$encodeLabel
=
isset
(
$item
[
'encode'
])
?
$item
[
'encode'
]
:
$this
->
encodeLabels
;
$label
=
$encodeLabel
?
Html
::
encode
(
$item
[
'label'
])
:
$item
[
'label'
];
$headerOptions
=
array_merge
(
$this
->
headerOptions
,
ArrayHelper
::
getValue
(
$item
,
'headerOptions'
,
[]));
$linkOptions
=
array_merge
(
$this
->
linkOptions
,
ArrayHelper
::
getValue
(
$item
,
'linkOptions'
,
[]));
...
...
framework/widgets/Menu.php
View file @
79f9f85f
...
...
@@ -257,7 +257,7 @@ class Menu extends Widget
if
(
!
isset
(
$item
[
'label'
]))
{
$item
[
'label'
]
=
''
;
}
$encodeLabel
=
$this
->
encodeLabels
||
isset
(
$item
[
'encode'
])
&&
$item
[
'encode'
]
===
true
;
$encodeLabel
=
isset
(
$item
[
'encode'
])
?
$item
[
'encode'
]
:
$this
->
encodeLabels
;
$items
[
$i
][
'label'
]
=
$encodeLabel
?
Html
::
encode
(
$item
[
'label'
])
:
$item
[
'label'
];
$hasActiveChild
=
false
;
if
(
isset
(
$item
[
'items'
]))
{
...
...
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