From fa61b3fbda09cde44917bc18ebc98216d09671b8 Mon Sep 17 00:00:00 2001 From: phpnut Date: Sat, 15 Mar 2008 05:16:18 +0000 Subject: [PATCH] "Resetting numeric keys for paths" git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6572 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/configure.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cake/libs/configure.php b/cake/libs/configure.php index 91f80ec1d..ce622d572 100644 --- a/cake/libs/configure.php +++ b/cake/libs/configure.php @@ -468,6 +468,7 @@ class Configure extends Object { $all = explode(PATH_SEPARATOR, ini_get('include_path')); $all = array_flip(array_flip((array_merge(array(CAKE_CORE_INCLUDE_PATH), $all)))); } + $all = array_values($all); foreach ($all as $path) { $path = rtrim($path, DS); @@ -600,10 +601,10 @@ class Configure extends Object { if (isset($paths[$pathsVar]) && !empty($paths[$pathsVar])) { $path = array_flip(array_flip((array_merge($_this->{$pathsVar}, (array)$paths[$pathsVar], $merge)))); - $_this->{$pathsVar} = $path; + $_this->{$pathsVar} = array_values($path); } else { $path = array_flip(array_flip((array_merge($_this->{$pathsVar}, $merge)))); - $_this->{$pathsVar} = $path; + $_this->{$pathsVar} = array_values($path); } } }