php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-23 18:18:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5279 from mikehaertl/master

Browse Source 
[skip ci] Expand abnormally used ternary operator to if
This commit is contained in:
Alexander Makarov
2014-10-01 16:08:00 +04:00
parent 8e16e17602 bf97adbf64
commit 336dd7602f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/helpers/BaseArrayHelper.php
View File

@@ -120,7 +120,11 @@ class BaseArrayHelper
$next = array_shift($args); $next = array_shift($args);
foreach ($next as $k => $v) { foreach ($next as $k => $v) {
if (is_integer($k)) { 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])) { } elseif (is_array($v) && isset($res[$k]) && is_array($res[$k])) {
$res[$k] = self::merge($res[$k], $v); $res[$k] = self::merge($res[$k], $v);
} else { } else {