Ticket #18453: 18453.patch

wp-includes/functions.php

@@ -3517 +3517 @@
         // Allow plugin to filter the output error trigger
         if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true ) ) {
                 $version = is_null( $version ) ? '' : sprintf( __( '(This message was added in version %s.)' ), $version );
-                trigger_error( sprintf( __( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s' ), $function, $message, $version ) );
+
+                if ( WP_DEBUG_DISPLAY ) {
+                        echo "<p><strong>$message</strong> $version</p>\n";
+                        wp_debug_backtrace();
+                } else {
+                        trigger_error( sprintf( __( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s' ), $function, $message, $version ) );
+                }
         }
 }
 
 /**
+ * Output formatted backtrace
+ *
+ * @subpackage Debug
+ * @since 3.3
+ */    
+function wp_debug_backtrace( $echo = true ) {
+        $all = array_reverse( debug_backtrace() );
+        $trace = '';
+        $i = 0;
+        $b1 = '<i>';
+        $b2 = '</i>';
+
+        foreach ( $all as $key => $call ) {
+                if ( $call['function'] == __FUNCTION__ || $call['function'] == '_doing_it_wrong' ) // skip __FUNCTION__ and _doing_it_wrong() calls
+                        continue;
+
+                ++$i;
+                $func = isset( $call['class'] ) ? "{$call['class']}->{$call['function']}" : $call['function'];
+
+                if ( strpos( $call['file'], '/plugins/' ) !== false || strpos( $call['file'], '/themes/' ) !== false )
+                        $b1 = $b2 = '';
+
+                $trace .= "{$i} $b1{$call['file']}, " . __('line:') . " {$call['line']}, " . __('function:') . " {$func} $b2\n";
+        }
+
+        if ( !$echo )
+                return $trace;
+
+        echo '<p>' . __('Backtrace:') . "</p>\n<pre style='overflow:auto;'>$trace</pre>";
+}
+
+/**
  * Is the server running earlier than 1.5.0 version of lighttpd?
  *
  * @since 2.5.0