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 @@ public static function get($array, $key, $default = null) 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 @@ public static function set(&$array, $key, $value) { $key = array_shift($keys); - if ( ! isset($array[$key])) + if ( ! isset($array[$key]) or ! is_array($array[$key])) { $array[$key] = array(); }