Changeset 12207 for trunk/wp-includes/functions.php

Timestamp:

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

Author:

westi

Message:

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

File:

• trunk/wp-includes/functions.php (modified) (4 diffs)

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 ) );