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
336dd760
Commit
336dd760
authored
Oct 01, 2014
by
Alexander Makarov
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5279 from mikehaertl/master
[skip ci] Expand abnormally used ternary operator to if
parents
8e16e176
bf97adbf
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
BaseArrayHelper.php
framework/helpers/BaseArrayHelper.php
+5
-1
No files found.
framework/helpers/BaseArrayHelper.php
View file @
336dd760
...
...
@@ -120,7 +120,11 @@ class BaseArrayHelper
$next
=
array_shift
(
$args
);
foreach
(
$next
as
$k
=>
$v
)
{
if
(
is_integer
(
$k
))
{
isset
(
$res
[
$k
])
?
$res
[]
=
$v
:
$res
[
$k
]
=
$v
;
if
(
isset
(
$res
[
$k
]))
{
$res
[]
=
$v
;
}
else
{
$res
[
$k
]
=
$v
;
}
}
elseif
(
is_array
(
$v
)
&&
isset
(
$res
[
$k
])
&&
is_array
(
$res
[
$k
]))
{
$res
[
$k
]
=
self
::
merge
(
$res
[
$k
],
$v
);
}
else
{
...
...
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