Changeset 42800

Timestamp:

03/08/2018 05:07:04 PM (6 years ago)

Author:

SergeyBiryukov

Message:

General: In wp_debug_backtrace_summary(), normalize paths before replacement for better cross–platform compatibility.

Props Rarst.
Fixes #43501.

File:

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

trunk/src/wp-includes/functions.php

@@ -5367 +5367 @@
  * @see https://core.trac.wordpress.org/ticket/19589
  *
+ * @staticvar array $truncate_paths Array of paths to truncate.
+ *
  * @param string $ignore_class Optional. A class to ignore all function calls within - useful
  *                             when you want to just give info about the callee. Default null.
@@ -5377 +5379 @@
  */
 function wp_debug_backtrace_summary( $ignore_class = null, $skip_frames = 0, $pretty = true ) {
+    static $truncate_paths;
+
     if ( version_compare( PHP_VERSION, '5.2.5', '>=' ) ) {
         $trace = debug_backtrace( false );
@@ -5386 +5390 @@
     $check_class = ! is_null( $ignore_class );
     $skip_frames++; // skip this function
+
+    if ( ! isset( $truncate_paths ) ) {
+        $truncate_paths = array(
+            wp_normalize_path( WP_CONTENT_DIR ),
+            wp_normalize_path( ABSPATH )
+        );
+    }
 
     foreach ( $trace as $call ) {
@@ -5400 +5411 @@
                 $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] ) . "')";
+                $caller[] = $call['function'] . "('" . str_replace( $truncate_paths, '', wp_normalize_path( $call['args'][0] ) ) . "')";
             } else {
                 $caller[] = $call['function'];