Moving dispatcher include so that cake/bootstrap.php is only bootstrapping the framework. This should allow reusing the bootstrap file for console and web once console error handler is fixed.

This commit is contained in:
Mark Story 2010-09-02 17:00:52 -04:00
parent d6b43c0e29
commit 81e6ca2249
2 changed files with 2 additions and 1 deletions

View file

@ -79,6 +79,7 @@
if (isset($_GET['url']) && $_GET['url'] === 'favicon.ico') { if (isset($_GET['url']) && $_GET['url'] === 'favicon.ico') {
return; return;
} else { } else {
require CAKE . 'dispatcher.php';
$Dispatcher = new Dispatcher(); $Dispatcher = new Dispatcher();
$Dispatcher->dispatch(); $Dispatcher->dispatch();
} }

View file

@ -36,4 +36,4 @@ require LIBS . 'error_handler.php';
set_exception_handler(array('ErrorHandler', 'handleException')); set_exception_handler(array('ErrorHandler', 'handleException'));
Configure::bootstrap(); Configure::bootstrap();
require CAKE . 'dispatcher.php';