From ba6f3c17fa36f27a36e87fe9dbba84ce9337e516 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 6 Nov 2011 09:42:15 -0500
Subject: [PATCH] Fix missing objects in App::objects()

App::objects() should include core objects when asking
for application objects.
---
 lib/Cake/Core/App.php               | 3 +++
 lib/Cake/Test/Case/Core/AppTest.php | 8 --------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php
index c76008ab4..7c280488e 100644
--- a/lib/Cake/Core/App.php
+++ b/lib/Cake/Core/App.php
@@ -422,6 +422,9 @@ 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 4c0e9c3ce..df33f73e2 100644
--- a/lib/Cake/Test/Case/Core/AppTest.php
+++ b/lib/Cake/Test/Case/Core/AppTest.php
@@ -278,14 +278,6 @@ 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);