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:
mark_story 2008-09-24 00:33:54 +00:00
parent 4ce3f21608
commit 3662f8c4d0

View file

@ -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;