From 81e6ca22490a2b4b560f2e1a0b160b83d5fee20d Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Thu, 2 Sep 2010 17:00:52 -0400
Subject: [PATCH] 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.

---
 app/webroot/index.php | 1 +
 cake/bootstrap.php    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/webroot/index.php b/app/webroot/index.php
index 396775b73..f6984a448 100644
--- 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
index f6288ee01..33b29eeea 100644
--- a/cake/bootstrap.php
+++ b/cake/bootstrap.php
@@ -36,4 +36,4 @@ require LIBS . 'error_handler.php';
 set_exception_handler(array('ErrorHandler', 'handleException'));
 
 Configure::bootstrap();
-require CAKE . 'dispatcher.php';
+