From de67e299a9ecaa78c26de24c4ff39a2342f8497c Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Tue, 8 Apr 2008 01:43:36 +0000
Subject: [PATCH] "Adding fix for bug introduced in [6407] that does not load
 the core ErrorHandler class"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6637 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/object.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/libs/object.php b/cake/libs/object.php
index fc4d6c0df..c52f7928a 100644
--- a/cake/libs/object.php
+++ b/cake/libs/object.php
@@ -174,12 +174,12 @@ class Object {
  */
 	function cakeError($method, $messages) {
 		if (!class_exists('ErrorHandler')) {
+			App::import('Core', 'Error');
+
 			if (file_exists(APP . 'error.php')) {
 				include_once (APP . 'error.php');
 			} elseif (file_exists(APP . 'app_error.php')) {
 				include_once (APP . 'app_error.php');
-			} else {
-				App::import('Core', 'Error');
 			}
 		}