Changeset 12685

Timestamp:

01/10/2010 10:57:01 AM (15 years ago)

Author:

westi

Message:

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

File:

• trunk/wp-settings.php (modified) (2 diffs)

trunk/wp-settings.php

@@ -203 +203 @@
 
 // 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);
@@ -217 +220 @@
     }
 } 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);