Permalink
Browse files

Fixing issues caused by merge with 1.2.

  • Loading branch information...
1 parent c4b493c commit fa1b7f617fbfee20b6f4c599a07ff852bcb3bdf5 @markstory markstory committed Nov 9, 2009
Showing with 5 additions and 9 deletions.
  1. +5 −9 cake/libs/configure.php
View
14 cake/libs/configure.php
@@ -403,6 +403,11 @@ function __loadBootstrap($boot) {
}
Cache::config('default');
}
+
+ if (!include(CONFIGS . 'bootstrap.php')) {
+ trigger_error(sprintf(__("Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR);
+ }
+
if (App::path('controllers') == array()) {
App::build(array(
'models' => $modelPaths, 'views' => $viewPaths, 'controllers' => $controllerPaths,
@@ -411,15 +416,6 @@ function __loadBootstrap($boot) {
'shells' => $shellPaths, 'libs' => $libPaths
));
}
-
- if (!include(CONFIGS . 'bootstrap.php')) {
- trigger_error(sprintf(__("Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR);
- }
-
- Configure::buildPaths(compact(
- 'modelPaths', 'viewPaths', 'controllerPaths', 'helperPaths', 'componentPaths',
- 'behaviorPaths', 'pluginPaths', 'vendorPaths', 'localePaths', 'shellPaths'
- ));
}
}
}

0 comments on commit fa1b7f6

Please sign in to comment.