Ticket #11090: wp_debug_identical.patch

wp-includes/http.php

@@ -655 +655 @@
 
                 $proxy = new WP_HTTP_Proxy();
 
-                if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) ) {
+                if ( defined('WP_DEBUG') && true === WP_DEBUG ) ) {
                         if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
-                                $handle = @fsockopen( $proxy->host(), $proxy->port(), $iError, $strError, $r['timeout'] );
+                                $handle = fsockopen( $proxy->host(), $proxy->port(), $iError, $strError, $r['timeout'] );
                         else
-                                $handle = @fsockopen( $fsockopen_host, $arrURL['port'], $iError, $strError, $r['timeout'] );
+                                $handle = fsockopen( $fsockopen_host, $arrURL['port'], $iError, $strError, $r['timeout'] );
                 } else {
                         if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
-                                $handle = fsockopen( $proxy->host(), $proxy->port(), $iError, $strError, $r['timeout'] );
+                                $handle = @fsockopen( $proxy->host(), $proxy->port(), $iError, $strError, $r['timeout'] );
                         else
-                                $handle = fsockopen( $fsockopen_host, $arrURL['port'], $iError, $strError, $r['timeout'] );
+                                $handle = @fsockopen( $fsockopen_host, $arrURL['port'], $iError, $strError, $r['timeout'] );
                 }
 
                 $endDelay = time();
@@ -826 +826 @@
                 if ( 'http' != $arrURL['scheme'] && 'https' != $arrURL['scheme'] )
                         $url = str_replace($arrURL['scheme'], 'http', $url);
 
-                if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) )
+                if ( defined('WP_DEBUG') && true === WP_DEBUG ) )
+                        $handle = fopen($url, 'r');
+                else
                         $handle = @fopen($url, 'r');
-                else
-                        $handle = fopen($url, 'r');
 
                 if (! $handle)
                         return new WP_Error('http_request_failed', sprintf(__('Could not open handle for fopen() to %s'), $url));
@@ -999 +999 @@
 
                 $context = stream_context_create($arrContext);
 
-                if ( ! defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) )
+                if ( defined('WP_DEBUG') && true === WP_DEBUG ) )
+                        $handle = fopen($url, 'r', false, $context);
+                else
                         $handle = @fopen($url, 'r', false, $context);
-                else
-                        $handle = fopen($url, 'r', false, $context);
 
                 if ( ! $handle)
                         return new WP_Error('http_request_failed', sprintf(__('Could not open handle for fopen() to %s'), $url));
@@ -1167 +1167 @@
                         }
                 }
 
-                if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) ) //Emits warning level notices for max redirects and timeouts
+                if ( defined('WP_DEBUG') && true === WP_DEBUG ) ) //Emits warning level notices for max redirects and timeouts
+                        $strResponse = http_request($r['method'], $url, $r['body'], $options, $info); //Emits warning level notices for max redirects and timeouts
+                else
                         $strResponse = @http_request($r['method'], $url, $r['body'], $options, $info);
-                else
-                        $strResponse = http_request($r['method'], $url, $r['body'], $options, $info); //Emits warning level notices for max redirects and timeouts
 
                 // Error may still be set, Response may return headers or partial document, and error
                 // contains a reason the request was aborted, eg, timeout expired or max-redirects reached.
@@ -1184 +1184 @@
                 $theHeaders = WP_Http::processHeaders($theHeaders);
 
                 if ( ! empty( $theBody ) && isset( $theHeaders['headers']['transfer-encoding'] ) && 'chunked' == $theHeaders['headers']['transfer-encoding'] ) {
-                        if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) )
+                        if ( defined('WP_DEBUG') && true === WP_DEBUG ) )
+                                $theBody = http_chunked_decode($theBody);
+                        else
                                 $theBody = @http_chunked_decode($theBody);
-                        else
-                                $theBody = http_chunked_decode($theBody);
                 }
 
                 if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) )

wp-includes/wp-db.php

@@ -357 +357 @@
         function __construct($dbuser, $dbpassword, $dbname, $dbhost) {
                 register_shutdown_function(array(&$this, "__destruct"));
 
-                if ( defined('WP_DEBUG') and WP_DEBUG == true )
+                if ( defined('WP_DEBUG') and true === WP_DEBUG )
                         $this->show_errors();
 
                 if ( defined('DB_CHARSET') )

wp-settings.php

@@ -199 +199 @@
 timer_start();
 
 // Add define('WP_DEBUG',true); to wp-config.php to enable display of notices during development.
-if ( defined('WP_DEBUG') && WP_DEBUG == true ) {
+if ( defined('WP_DEBUG') && true === WP_DEBUG ) {
         error_reporting(E_ALL);
         // Add define('WP_DEBUG_DISPLAY', false); to wp-config.php to use the globally configured setting for display_errors and not force it to On
         if ( ! defined('WP_DEBUG_DISPLAY') || WP_DEBUG_DISPLAY == true )