Ticket #19589: simpler-backtraces-core.diff

wp-includes/functions.php

@@ -4673 +4673 @@
         return $protocols;
 }
 
-?>
+/**
+ * Return a comma seperated string of functions that have been called to get to the current point in code.
+ *
+ * @since 3.4
+ */
+function wp_debug_backtrace_summary( $ignore_class = null, $skip_frames = 0 ) {
+        // TODO: Maybe add version based switching for even less backtrace info
+        $trace  = debug_backtrace( false );
+        $caller = array();
+        $check_class = ! is_null( $ignore_class );
+        $skip_frames++; // skip this function
+
+        foreach ( $trace as $call ) {
+                if ( $skip_frames > 0 ) {
+                        $skip_frames--;
+                } elseif ( isset( $call['class'] ) ) {
+                        if ( $check_class && $ignore_class == $call['class'] )
+                                continue; // Filter out calls
+                        
+                        $caller[] = "{$call['class']}{$call['type']}{$call['function']}";
+                } else {
+                        if ( in_array( $call['function'], array( 'do_action', 'apply_filters' ) ) ) {
+                                $caller[] = "{$call['function']}('{$call['args'][0]}')";
+                        } elseif ( in_array( $call['function'], array( 'include', 'include_once', 'require', 'require_once' ) ) ) {
+                                $caller[] = $call['function'] . "('" . str_replace( array( WP_CONTENT_DIR, ABSPATH ) , '', $call['args'][0] ) . "')";
+                        } else {
+                                $caller[] = $call['function'];
+                        }
+                }
+        }
+
+        return join( ', ', array_reverse( $caller ) );
+
+}
+
+?>
+ No newline at end of file

wp-includes/wp-db.php

@@ -1546 +1546 @@
          * @return string The name of the calling function
          */
         function get_caller() {
-                $trace  = array_reverse( debug_backtrace() );
-                $caller = array();
-
-                foreach ( $trace as $call ) {
-                        if ( isset( $call['class'] ) && __CLASS__ == $call['class'] )
-                                continue; // Filter out wpdb calls.
-                        $caller[] = isset( $call['class'] ) ? "{$call['class']}->{$call['function']}" : $call['function'];
-                }
-
-                return join( ', ', $caller );
+                return wp_debug_backtrace_summary( __CLASS__ );
         }
 
         /**