From 2fee0b5b63fc97f7b952a84bccf7f7e28d8ba1d0 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 4 Jul 2010 22:03:25 -0400 Subject: [PATCH] Updating console bootstrap process. --- cake/console/cake.php | 2 +- cake/libs/configure.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cake/console/cake.php b/cake/console/cake.php index 050e90574..93e70af21 100644 --- a/cake/console/cake.php +++ b/cake/console/cake.php @@ -265,7 +265,7 @@ class ShellDispatcher { } } - Configure::getInstance(file_exists(CONFIGS . 'bootstrap.php')); + Configure::bootstrap(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'; diff --git a/cake/libs/configure.php b/cake/libs/configure.php index 3939953c8..de12d7bc0 100644 --- a/cake/libs/configure.php +++ b/cake/libs/configure.php @@ -48,11 +48,11 @@ class Configure extends Object { * * @return void */ - public static function bootstrap() { + public static function bootstrap($boot = true) { if (!class_exists('Set')) { require LIBS . 'set.php'; } - self::__loadBootstrap(true); + self::__loadBootstrap($boot); } /**