diff --git a/src/Illuminate/Support/Arr.php b/src/Illuminate/Support/Arr.php index 616c030c5fe3..8e988289e485 100755 --- a/src/Illuminate/Support/Arr.php +++ b/src/Illuminate/Support/Arr.php @@ -294,11 +294,11 @@ public static function get($array, $key, $default = null) } foreach (explode('.', $key) as $segment) { - if (static::accessible($array) && static::exists($array, $segment)) { - $array = $array[$segment]; - } else { - return value($default); + if (!static::accessible($array) || !static::exists($array, $segment)) { + return value($default); } + + $array = $array[$segment]; } return $array; @@ -335,11 +335,11 @@ public static function has($array, $keys) } foreach (explode('.', $key) as $segment) { - if (static::accessible($subKeyArray) && static::exists($subKeyArray, $segment)) { - $subKeyArray = $subKeyArray[$segment]; - } else { - return false; + if (!static::accessible($subKeyArray) || !static::exists($subKeyArray, $segment)) { + return false; } + + $subKeyArray = $subKeyArray[$segment]; } }