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

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@12207 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2009-11-18 08:22:49 +00:00
parent f4ae37b9f1
commit e7941d795e
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/functions.php
View File

@ -2927,8 +2927,7 @@ function atom_service_url_filter($url)
* 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
* 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
*
@ -2949,7 +2948,7 @@ function _deprecated_function($function, $version, $replacement=null) {
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 <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
else
@ -2964,8 +2963,7 @@ function _deprecated_function($function, $version, $replacement=null) {
* 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
* 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
*
@ -2986,7 +2984,7 @@ function _deprecated_file($file, $version, $replacement=null) {
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 <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) );
else

10
wp-includes/http.php
View File

@ -655,7 +655,7 @@ class WP_Http_Fsockopen {
$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 @@ class WP_Http_Fopen {
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 @@ class WP_Http_Streams {
$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 @@ class WP_Http_ExtHTTP {
}
}
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 @@ class WP_Http_ExtHTTP {
$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);

2
wp-includes/wp-db.php
View File

@ -357,7 +357,7 @@ class wpdb {
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') )

1
wp-settings.php
View File

@ -210,6 +210,7 @@ if ( defined('WP_DEBUG') && WP_DEBUG == true ) {
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