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

Force display_errors to off when WP_DEBUG_DISPLAY == false. Technically a backwards incompatible change - if you want the passthrough to php.ini (which false used to provide) then use WP_DEBUG_DISPLAY === null. see #18391. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-08-13 18:59:05 +00:00
parent 4e4932296f
commit 50f5ad2216
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/default-constants.php
View File

@ -49,7 +49,8 @@ function wp_initial_constants( ) {
if ( !defined('WP_DEBUG') ) if ( !defined('WP_DEBUG') )
define( 'WP_DEBUG', false ); define( 'WP_DEBUG', false );
// Add define('WP_DEBUG_DISPLAY', false); to wp-config.php use the globally configured setting for display_errors and not force errors to be displayed. // Add define('WP_DEBUG_DISPLAY', null); to wp-config.php use the globally configured setting for
// display_errors and not force errors to be displayed. Use false to force display_errors off.
if ( !defined('WP_DEBUG_DISPLAY') ) if ( !defined('WP_DEBUG_DISPLAY') )
define( 'WP_DEBUG_DISPLAY', true ); define( 'WP_DEBUG_DISPLAY', true );

8
wp-includes/load.php
View File

@ -249,9 +249,9 @@ function timer_stop( $display = 0, $precision = 3 ) { // if called like timer_st
* development environments. * development environments.
* *
* When WP_DEBUG_DISPLAY is true, WordPress will force errors to be displayed. * When WP_DEBUG_DISPLAY is true, WordPress will force errors to be displayed.
* WP_DEBUG_DISPLAY defaults to true. Defining it as false prevents WordPress from * WP_DEBUG_DISPLAY defaults to true. Defining it as null prevents WordPress from
* changing the global configuration setting. (Defining WP_DEBUG_DISPLAY as false * changing the global configuration setting. Defining WP_DEBUG_DISPLAY as false
* will never force errors to be hidden.) * will force errors to be hidden.
* *
* When WP_DEBUG_LOG is true, errors will be logged to wp-content/debug.log. * When WP_DEBUG_LOG is true, errors will be logged to wp-content/debug.log.
* WP_DEBUG_LOG defaults to false. * WP_DEBUG_LOG defaults to false.
@ -270,6 +270,8 @@ function wp_debug_mode() {
if ( WP_DEBUG_DISPLAY ) if ( WP_DEBUG_DISPLAY )
ini_set( 'display_errors', 1 ); ini_set( 'display_errors', 1 );
elseif ( null !== WP_DEBUG_DISPLAY )
ini_set( 'display_errors', 0 );
if ( WP_DEBUG_LOG ) { if ( WP_DEBUG_LOG ) {
ini_set( 'log_errors', 1 ); ini_set( 'log_errors', 1 );