From 7847044711720333815524e10a6ef15a3f3e5e3d Mon Sep 17 00:00:00 2001
From: nate <nate@cakephp.org>
Date: Sat, 1 Aug 2009 08:36:57 -0400
Subject: [PATCH] Moving error flags to core bootstrap to avoid extra changes
 in user files, fixing error in previous commit.

---
 app/webroot/index.php                              | 7 -------
 cake/bootstrap.php                                 | 4 +++-
 cake/console/libs/templates/skel/webroot/index.php | 7 -------
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/app/webroot/index.php b/app/webroot/index.php
index 083812fdd..526cecba3 100644
--- a/app/webroot/index.php
+++ b/app/webroot/index.php
@@ -52,13 +52,6 @@
 	if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 		define('CAKE_CORE_INCLUDE_PATH', ROOT);
 	}
-/**
- * PHP 5.3 raises many notices in bootstrap.
- */
-	if (!defined('E_DEPRECATED')) {
-		define('E_DEPRECATED', 8192);
-	}
-	error_reporting(E_ALL & ~E_DEPRECATED);
 
 /**
  * Editing below this line should NOT be necessary.
diff --git a/cake/bootstrap.php b/cake/bootstrap.php
index 88d1526d7..1aafb6237 100644
--- a/cake/bootstrap.php
+++ b/cake/bootstrap.php
@@ -23,8 +23,10 @@ if (!defined('PHP5')) {
 	define('PHP5', (PHP_VERSION >= 5));
 }
 if (!defined('E_DEPRECATED')) {
-	define('PHP5', (PHP_VERSION >= 5));
+	define('E_DEPRECATED', 8192);
 }
+error_reporting(E_ALL & ~E_DEPRECATED);
+
 require CORE_PATH . 'cake' . DS . 'basics.php';
 $TIME_START = getMicrotime();
 require CORE_PATH . 'cake' . DS . 'config' . DS . 'paths.php';
diff --git a/cake/console/libs/templates/skel/webroot/index.php b/cake/console/libs/templates/skel/webroot/index.php
index 37b6fee49..6c8cecdd9 100644
--- a/cake/console/libs/templates/skel/webroot/index.php
+++ b/cake/console/libs/templates/skel/webroot/index.php
@@ -62,13 +62,6 @@
 	if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 		define('CAKE_CORE_INCLUDE_PATH', ROOT);
 	}
-/**
- * PHP 5.3 raises many notices in bootstrap.
- */
-	if (!defined('E_DEPRECATED')) {
-		define('E_DEPRECATED', 8192);
-	}
-	error_reporting(E_ALL & ~E_DEPRECATED);
 
 /**
  * Editing below this line should not be necessary.