Moving error flags to core bootstrap to avoid extra changes in user f…

…iles, fixing error in previous commit.
cakephp · Aug 1, 2009 · 7847044 · 7847044
1 parent e47b196
commit 7847044
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git 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
@@ -23,8 +23,10 @@
 	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
@@ -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.