Changeset 12207

Timestamp:

11/18/2009 08:22:49 AM (17 years ago)

Author:

westi

Message:

Ensure WP_DEBUG is always defined and simplify the checks on it. Fixes #11090 props nacin.

Location:

trunk

Files:

• wp-includes/functions.php (modified) (4 diffs)
• wp-includes/http.php (modified) (5 diffs)
• wp-includes/wp-db.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -2928 +2928 @@
  * function.
  *
- * The current behavior is to trigger an user error if WP_DEBUG is defined and
- * is true.
+ * The current behavior is to trigger an user error if WP_DEBUG is true.
  *
  * This function is to be used in every function in depreceated.php
@@ -2950 +2949 @@
 
         // Allow plugin to filter the output error trigger
-        if( defined('WP_DEBUG') && ( true === WP_DEBUG ) && apply_filters( 'deprecated_function_trigger_error', true )) {
+        if( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true )) {
                 if( !is_null($replacement) )
                         trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
@@ -2965 +2964 @@
  * file.
  *
- * The current behavior is to trigger an user error if WP_DEBUG is defined and
- * is true.
+ * The current behavior is to trigger an user error if WP_DEBUG is true.
  *
  * This function is to be used in every file that is depreceated
@@ -2987 +2985 @@
 
         // Allow plugin to filter the output error trigger
-        if( defined('WP_DEBUG') && ( true === WP_DEBUG ) && apply_filters( 'deprecated_file_trigger_error', true )) {
+        if( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) {
                 if( !is_null($replacement) )
                         trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) );

trunk/wp-includes/http.php

@@ -656 +656 @@
                 $proxy = new WP_HTTP_Proxy();
 
-                if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) ) {
+                if ( !WP_DEBUG ) {
                         if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
                                 $handle = @fsockopen( $proxy->host(), $proxy->port(), $iError, $strError, $r['timeout'] );
@@ -827 +827 @@
                         $url = str_replace($arrURL['scheme'], 'http', $url);
 
-                if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) )
+                if ( !WP_DEBUG )
                         $handle = @fopen($url, 'r');
                 else
@@ -1000 +1000 @@
                 $context = stream_context_create($arrContext);
 
-                if ( ! defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) )
+                if ( !WP_DEBUG )
                         $handle = @fopen($url, 'r', false, $context);
                 else
@@ -1168 +1168 @@
                 }
 
-                if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) ) //Emits warning level notices for max redirects and timeouts
+                if ( !WP_DEBUG ) //Emits warning level notices for max redirects and timeouts
                         $strResponse = @http_request($r['method'], $url, $r['body'], $options, $info);
                 else
@@ -1185 +1185 @@
 
                 if ( ! empty( $theBody ) && isset( $theHeaders['headers']['transfer-encoding'] ) && 'chunked' == $theHeaders['headers']['transfer-encoding'] ) {
-                        if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) )
+                        if ( !WP_DEBUG )
                                 $theBody = @http_chunked_decode($theBody);
                         else

trunk/wp-includes/wp-db.php

@@ -358 +358 @@
                 register_shutdown_function(array(&$this, "__destruct"));
 
-                if ( defined('WP_DEBUG') and WP_DEBUG == true )
+                if ( WP_DEBUG )
                         $this->show_errors();
 

trunk/wp-settings.php

@@ -211 +211 @@
         }
 } 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);