adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'refactoringAppBuild' of https://github.com/basuke/cakephp into basuke-refactoringAppBuild

Browse source
This commit is contained in:
Jose Lorenzo Rodriguez 2011-10-05 10:03:31 -04:30
commit ecb63d93bc
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/Cake/Core/App.php
View file

@ -359,22 +359,29 @@ class App {
}
}
foreach ($defaults as $type => $default) {
if (empty(self::$_packages[$type]) || empty($paths)) {
self::$_packages[$type] = $default;
}
if (empty($paths)) {
self::$_packages = $defaults;
return;
}
if (!empty($paths[$type])) {
if ($mode === App::PREPEND) {
$path = array_merge((array)$paths[$type], self::$_packages[$type]);
} else {
$path = array_merge(self::$_packages[$type], (array)$paths[$type]);
}
} else {
foreach ($defaults as $type => $default) {
if (!empty(self::$_packages[$type])) {
$path = self::$_packages[$type];
}
self::$_packages[$type] = array_values(array_unique($path));
if (!empty($paths[$type])) {
$newPath = (array)$paths[$type];
if ($mode === App::PREPEND) {
$path = array_merge($newPath, $path);
} else {
$path = array_merge($path, $newPath);
}
$path = array_values(array_unique($path));
}
self::$_packages[$type] = $path;
}
}