adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-18 23:49:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

"Resetting numeric keys for paths"

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6572 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2008-03-15 05:16:18 +00:00
parent a282e1152f
commit fa61b3fbda
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cake/libs/configure.php
View file

@ -468,6 +468,7 @@ class Configure extends Object {
$all = explode(PATH_SEPARATOR, ini_get('include_path')); $all = explode(PATH_SEPARATOR, ini_get('include_path'));
$all = array_flip(array_flip((array_merge(array(CAKE_CORE_INCLUDE_PATH), $all)))); $all = array_flip(array_flip((array_merge(array(CAKE_CORE_INCLUDE_PATH), $all))));
} }
$all = array_values($all);
foreach ($all as $path) { foreach ($all as $path) {
$path = rtrim($path, DS); $path = rtrim($path, DS);
@ -600,10 +601,10 @@ class Configure extends Object {
if (isset($paths[$pathsVar]) && !empty($paths[$pathsVar])) { if (isset($paths[$pathsVar]) && !empty($paths[$pathsVar])) {
$path = array_flip(array_flip((array_merge($_this->{$pathsVar}, (array)$paths[$pathsVar], $merge)))); $path = array_flip(array_flip((array_merge($_this->{$pathsVar}, (array)$paths[$pathsVar], $merge))));
$_this->{$pathsVar} = $path; $_this->{$pathsVar} = array_values($path);
} else { } else {
$path = array_flip(array_flip((array_merge($_this->{$pathsVar}, $merge)))); $path = array_flip(array_flip((array_merge($_this->{$pathsVar}, $merge))));
$_this->{$pathsVar} = $path; $_this->{$pathsVar} = array_values($path);
} }
} }
} }