Moving dispatcher include so that cake/bootstrap.php is only bootstra…

…pping the framework. This should allow reusing the bootstrap file for console and web once console error handler is fixed.
cakephp · Sep 2, 2010 · 81e6ca2 · 81e6ca2
1 parent d6b43c0
commit 81e6ca2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/webroot/index.php b/app/webroot/index.php
@@ -79,6 +79,7 @@
 	if (isset($_GET['url']) && $_GET['url'] === 'favicon.ico') {
 		return;
 	} else {
+		require CAKE . 'dispatcher.php';
 		$Dispatcher = new Dispatcher();
 		$Dispatcher->dispatch();
 	}
diff --git a/cake/bootstrap.php b/cake/bootstrap.php
@@ -36,4 +36,4 @@
 set_exception_handler(array('ErrorHandler', 'handleException'));
 
 Configure::bootstrap();
-require CAKE . 'dispatcher.php';
+