From 7a93276ecf0c8812e64abb21c1917ad81c601208 Mon Sep 17 00:00:00 2001 From: Thomas Ploch Date: Thu, 8 Mar 2012 16:00:09 +0100 Subject: [PATCH] Move inclusion of application bootstrap behind ErrorHandler initialization in Configure::bootstrap(). --- lib/Cake/Core/Configure.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Cake/Core/Configure.php b/lib/Cake/Core/Configure.php index dc7b68c72..8da62466a 100644 --- a/lib/Cake/Core/Configure.php +++ b/lib/Cake/Core/Configure.php @@ -75,9 +75,6 @@ class Configure { App::$bootstrapping = false; App::init(); App::build(); - if (!include APP . 'Config' . DS . 'bootstrap.php') { - trigger_error(__d('cake_dev', "Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", APP . 'Config' . DS), E_USER_ERROR); - } $level = -1; if (isset(self::$_values['Error']['level'])) { error_reporting(self::$_values['Error']['level']); @@ -89,6 +86,9 @@ class Configure { if (!empty(self::$_values['Exception']['handler'])) { set_exception_handler(self::$_values['Exception']['handler']); } + if (!include APP . 'Config' . DS . 'bootstrap.php') { + trigger_error(__d('cake_dev', "Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", APP . 'Config' . DS), E_USER_ERROR); + } } }