Ticket #44177: wp_debug_backtrace_summary.diff

wp-includes/functions.php

@@ -5408 +5408 @@
  *                             back to the source of the issue. Default 0.
  * @param bool   $pretty       Optional. Whether or not you want a comma separated string or raw
  *                             array returned. Default true.
+ * @param bool   $include_args Optional. Whether or not you want to include arguments in the 
+ *                             output. Default false.
  * @return string|array Either a string containing a reversed comma separated trace or an array
  *                      of individual calls.
  */
-function wp_debug_backtrace_summary( $ignore_class = null, $skip_frames = 0, $pretty = true ) {
+function wp_debug_backtrace_summary( $ignore_class = null, $skip_frames = 0, $pretty = true, $include_args = false ) {
         static $truncate_paths;
 
-        if ( version_compare( PHP_VERSION, '5.2.5', '>=' ) ) {
-                $trace = debug_backtrace( false );
-        } else {
-                $trace = debug_backtrace();
-        }
+        $trace = debug_backtrace( false );
 
         $caller      = array();
         $check_class = ! is_null( $ignore_class );
@@ -5435 +5433 @@
                 if ( $skip_frames > 0 ) {
                         $skip_frames--;
                 } elseif ( isset( $call['class'] ) ) {
-                        if ( $check_class && $ignore_class == $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', 'do_action_ref_array', 'apply_filters_ref_array' ) ) ) {
+                        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' ) ) ) {
-                                $filename = isset( $call['args'][0] ) ? $call['args'][0] : '';
-                                $caller[] = $call['function'] . "('" . str_replace( $truncate_paths, '', wp_normalize_path( $filename ) ) . "')";
+                                $caller[] = $call['function'] . "('" . str_replace( array( WP_CONTENT_DIR, ABSPATH ) , '', $call['args'][0] ) . "')";
+                        } elseif ( !$include_args || empty( $call['args'] ) ) {
+                                        $caller[] = $call['function'];
                         } else {
-                                $caller[] = $call['function'];
+                                $args_as_text = array();
+                                foreach ( $call['args'] as $arg ) {
+                                        if ( is_string( $arg ) ) {
+                                                $args_as_text[] = '"' . $arg . '"';
+                                        } elseif ( is_null ( $arg ) ) {
+                                                $args_as_text[] = 'null';
+                                        } elseif ( is_bool( $arg ) || is_numeric( $arg ) ) {
+                                                $args_as_text[] = $arg;
+                                        } elseif ( is_object( $arg ) ) {
+                                                $args_as_text[] = get_class($arg);
+                                        } elseif ( is_callable ( $arg ) ) {
+                                                $args_as_text[] = "Callable";
+                                        } elseif ( is_array( $arg ) ) {
+                                                $args_as_text[] = "Array";
+                                        } else {
+                                                $args_as_text[] = "?";
+                                        }
+                                }
+                                $caller[] = $call['function'] . "(" . join( ', ', $args_as_text ) . ")";
                         }
                 }
         }