Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php (revision 12153)
+++ wp-includes/functions.php (working copy)
@@ -2933,7 +2933,7 @@
* to get the backtrace up to what file and function called the deprecated
* function.
*
- * The current behavior is to trigger an user error if WP_DEBUG is defined and
+ * 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
@@ -2955,7 +2955,7 @@
do_action('deprecated_function_run', $function, $replacement);
// 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 deprecated since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
else
@@ -2970,7 +2970,7 @@
* to get the backtrace up to what file and function included the deprecated
* file.
*
- * The current behavior is to trigger an user error if WP_DEBUG is defined and
+ * 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
@@ -2992,7 +2992,7 @@
do_action('deprecated_file_included', $file, $replacement);
// 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 deprecated since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) );
else
Index: wp-includes/http.php
===================================================================
--- wp-includes/http.php (revision 12153)
+++ wp-includes/http.php (working copy)
@@ -655,7 +655,7 @@
$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'] );
else
@@ -826,7 +826,7 @@
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 ( !WP_DEBUG )
$handle = @fopen($url, 'r');
else
$handle = fopen($url, 'r');
@@ -999,7 +999,7 @@
$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
$handle = fopen($url, 'r', false, $context);
@@ -1167,7 +1167,7 @@
}
}
- 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
$strResponse = http_request($r['method'], $url, $r['body'], $options, $info); //Emits warning level notices for max redirects and timeouts
@@ -1184,7 +1184,7 @@
$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 ( !WP_DEBUG )
$theBody = @http_chunked_decode($theBody);
else
$theBody = http_chunked_decode($theBody);
Index: wp-includes/wp-db.php
===================================================================
--- wp-includes/wp-db.php (revision 12153)
+++ wp-includes/wp-db.php (working copy)
@@ -357,7 +357,7 @@
function __construct($dbuser, $dbpassword, $dbname, $dbhost) {
register_shutdown_function(array(&$this, "__destruct"));
- if ( defined('WP_DEBUG') and WP_DEBUG == true )
+ if ( WP_DEBUG )
$this->show_errors();
if ( defined('DB_CHARSET') )
Index: wp-settings.php
===================================================================
--- wp-settings.php (revision 12153)
+++ wp-settings.php (working copy)
@@ -210,6 +210,7 @@
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