mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 11:28:25 +00:00
Changing how Folder Class is loaded. Fixes infinite loops resulting in segfault under apache 2 when Cache.disable = true and debug = 0. Closes #5458
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7651 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
4ce3f21608
commit
3662f8c4d0
1 changed files with 3 additions and 1 deletions
|
@ -893,7 +893,9 @@ class App extends Object {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!isset($_this->__paths[$path])) {
|
if (!isset($_this->__paths[$path])) {
|
||||||
$_this->import('Folder');
|
if (!class_exists('Folder')) {
|
||||||
|
require LIBS . 'folder.php';
|
||||||
|
}
|
||||||
$Folder =& new Folder();
|
$Folder =& new Folder();
|
||||||
$directories = $Folder->tree($path, false, 'dir');
|
$directories = $Folder->tree($path, false, 'dir');
|
||||||
$_this->__paths[$path] = $directories;
|
$_this->__paths[$path] = $directories;
|
||||||
|
|
Loading…
Reference in a new issue