mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-18 18:46:17 +00:00
"Resetting numeric keys for paths"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6572 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
a282e1152f
commit
fa61b3fbda
1 changed files with 3 additions and 2 deletions
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue