WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tidy up logic for defining WP_DEBUG so we only define it if it isn't already. Fixes #11837 props nacin. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@12685 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2010-01-10 10:57:01 +00:00
parent b26dc3c874
commit 3153720d35
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-settings.php
View File

@ -202,7 +202,10 @@ function timer_stop($display = 0, $precision = 3) { //if called like timer_stop(
timer_start();
// Add define('WP_DEBUG', true); to wp-config.php to enable display of notices during development.
if ( defined('WP_DEBUG') && WP_DEBUG ) {
if ( !defined('WP_DEBUG') )
define( 'WP_DEBUG', false );
if ( WP_DEBUG ) {
if ( defined('E_DEPRECATED') )
error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
else
@ -216,7 +219,6 @@ if ( defined('WP_DEBUG') && WP_DEBUG ) {
ini_set('error_log', WP_CONTENT_DIR . '/debug.log');
}
} else {
define('WP_DEBUG', false);
if ( defined('E_RECOVERABLE_ERROR') )
error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
else