Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3

This commit is contained in:
Mark Story 2010-02-24 22:58:26 -05:00
commit 6285f7893e

View file

@ -264,10 +264,13 @@ class ShellDispatcher {
}
}
Configure::getInstance(file_exists(CONFIGS . 'bootstrap.php'));
if (!file_exists(APP_PATH . 'config' . DS . 'core.php')) {
include_once CORE_PATH . 'cake' . DS . 'console' . DS . 'templates' . DS . 'skel' . DS . 'config' . DS . 'core.php';
App::build();
}
Configure::getInstance(file_exists(CONFIGS . 'bootstrap.php'));
return true;
}