Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Move inclusion of application bootstrap behind ErrorHandler initializ…

…ation in Configure::bootstrap().
  • Loading branch information...
commit 7a93276ecf0c8812e64abb21c1917ad81c601208 1 parent a4da64c
Thomas Ploch authored

Showing 1 changed file with 3 additions and 3 deletions. Show diff stats Hide diff stats

  1. +3 3 lib/Cake/Core/Configure.php
6 lib/Cake/Core/Configure.php
@@ -75,9 +75,6 @@ public static function bootstrap($boot = true) {
75 75 App::$bootstrapping = false;
76 76 App::init();
77 77 App::build();
78   - if (!include APP . 'Config' . DS . 'bootstrap.php') {
79   - 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);
80   - }
81 78 $level = -1;
82 79 if (isset(self::$_values['Error']['level'])) {
83 80 error_reporting(self::$_values['Error']['level']);
@@ -89,6 +86,9 @@ public static function bootstrap($boot = true) {
89 86 if (!empty(self::$_values['Exception']['handler'])) {
90 87 set_exception_handler(self::$_values['Exception']['handler']);
91 88 }
  89 + if (!include APP . 'Config' . DS . 'bootstrap.php') {
  90 + 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);
  91 + }
92 92 }
93 93 }
94 94

0 comments on commit 7a93276

Please sign in to comment.
Something went wrong with that request. Please try again.