Permalink
Browse files

Modifying the bootstrap process, to match the documented changes. $pl…

…uginPaths style variables will no longer work. You need to use App::build() to set paths in the bootstrap file. Added a build() call before the bootstrap is included. This allows cold cache import() calls to work from bootstrap.php.
  • Loading branch information...
1 parent effbbec commit dc8f49fedafb1ac6efaef8a54ac43e7e4c433692 @markstory markstory committed Feb 14, 2010
Showing with 1 addition and 12 deletions.
  1. +1 −12 cake/libs/configure.php
View
@@ -384,8 +384,6 @@ function buildPaths($paths) {
* @access private
*/
function __loadBootstrap($boot) {
- $libPaths = $modelPaths = $behaviorPaths = $controllerPaths = $componentPaths = $viewPaths = $helperPaths = $pluginPaths = $vendorPaths = $localePaths = $shellPaths = null;
-
if ($boot) {
Configure::write('App', array('base' => false, 'baseUrl' => false, 'dir' => APP_DIR, 'webroot' => WEBROOT_DIR, 'www_root' => WWW_ROOT));
@@ -429,19 +427,10 @@ function __loadBootstrap($boot) {
}
Cache::config('default');
}
-
+ App::build();
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,
- 'helpers' => $helperPaths, 'components' => $componentPaths, 'behaviors' => $behaviorPaths,
- 'plugins' => $pluginPaths, 'vendors' => $vendorPaths, 'locales' => $localePaths,
- 'shells' => $shellPaths, 'libs' => $libPaths
- ));
- }
}
}
}

0 comments on commit dc8f49f

Please sign in to comment.