From 467ae1f4fd8dd8ce1bba12425ac936f9600c94e4 Mon Sep 17 00:00:00 2001 From: dogmatic Date: Tue, 5 Jan 2010 01:23:06 +0200 Subject: [PATCH] Removing check that prevents bootstrapping paths that do not contain the type of object contained. Example plugins would not be found in the following path /var/www/common/ as it does not contain 'plugins' Signed-off-by: Mark Story --- cake/libs/configure.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cake/libs/configure.php b/cake/libs/configure.php index 4c9d2526c..6558a9066 100644 --- a/cake/libs/configure.php +++ b/cake/libs/configure.php @@ -217,7 +217,7 @@ class Configure extends Object { * Loads a file from app/config/configure_file.php. * Config file variables should be formated like: * `$config['name'] = 'value';` - * These will be used to create dynamic Configure vars. load() is also used to + * These will be used to create dynamic Configure vars. load() is also used to * load stored config files created with Configure::store() * * - To load config files from app/config use `Configure::load('configure_file');`. @@ -236,7 +236,7 @@ class Configure extends Object { $pluginPath = App::pluginPath($plugin); } $pos = strpos($fileName, '..'); - + if ($pos === false) { if ($pluginPath && file_exists($pluginPath . 'config' . DS . $fileName . '.php')) { include($pluginPath . 'config' . DS . $fileName . '.php'); @@ -822,10 +822,8 @@ class App extends Object { $items = array(); foreach ((array)$path as $dir) { - if ($type === 'file' || $type === 'class' || strpos($dir, $type) !== false) { $items = $_this->__list($dir, $types[$type]['suffix'], $extension); $objects = array_merge($items, array_diff($objects, $items)); - } } if ($type !== 'file') {