Browse Source

Merge pull request #5279 from mikehaertl/master

[skip ci] Expand abnormally used ternary operator to if
tags/2.0.0
Alexander Makarov 10 years ago
parent
commit
336dd7602f
  1. 6
      framework/helpers/BaseArrayHelper.php

6
framework/helpers/BaseArrayHelper.php

@ -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 {

Loading…
Cancel
Save