From cd90845accf2090fd7b59162f69728b8b579f556 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 15 Aug 2011 15:05:57 -0500 Subject: [PATCH] Fix a couple of bugs in the Arr class. --- system/arr.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/arr.php b/system/arr.php index 942404c4..0e952c70 100644 --- a/system/arr.php +++ b/system/arr.php @@ -20,7 +20,7 @@ class Arr { foreach (explode('.', $key) as $segment) { - if ( ! array_key_exists($segment, $array)) + if ( ! is_array($array) or ! array_key_exists($segment, $array)) { return is_callable($default) ? call_user_func($default) : $default; } @@ -52,7 +52,7 @@ class Arr { { $key = array_shift($keys); - if ( ! isset($array[$key])) + if ( ! isset($array[$key]) or ! is_array($array[$key])) { $array[$key] = array(); }