diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php index 7c280488e..c76008ab4 100644 --- a/lib/Cake/Core/App.php +++ b/lib/Cake/Core/App.php @@ -422,9 +422,6 @@ class App { if (empty($path)) { $path = self::path($type, $plugin); - if (empty($plugin)) { - $path = array_merge($path, App::core($type)); - } } foreach ((array)$path as $dir) { diff --git a/lib/Cake/Test/Case/Core/AppTest.php b/lib/Cake/Test/Case/Core/AppTest.php index df33f73e2..4c0e9c3ce 100644 --- a/lib/Cake/Test/Case/Core/AppTest.php +++ b/lib/Cake/Test/Case/Core/AppTest.php @@ -278,6 +278,14 @@ class AppTest extends CakeTestCase { $this->assertTrue(in_array('Dispatcher', $result)); $this->assertTrue(in_array('Router', $result)); + App::build(array( + 'Model/Behavior' => App::core('Model/Behavior'), + 'Controller' => App::core('Controller'), + 'Controller/Component' => App::core('Controller/Component'), + 'View' => App::core('View'), + 'Model' => App::core('Model'), + 'View/Helper' => App::core('View/Helper'), + ), App::RESET); $result = App::objects('behavior', null, false); $this->assertTrue(in_array('TreeBehavior', $result)); $result = App::objects('Model/Behavior', null, false);