Changeset 53019 for branches/5.9

Timestamp:

03/29/2022 03:41:42 PM (4 years ago)

Author:

audrasjb

Message:

Editor: Fix broken asset URLs when using WP outside of the regular directory

Both CSS and JS URLs were totally broken for some of the newer blocks (e.g. the navigation block in the 2022 theme) when WP core is outside of the current directory using a different prefix.

Props gziolo, SergeyBiryukov, pgpagely, Mamaduka.
Merges [52939] to the 5.9 branch.
Fixes #55311.

Location:

branches/5.9

Files:

• . (modified) (1 prop)
• src/wp-includes/blocks.php (modified) (3 diffs)

branches/5.9/src/wp-includes/blocks.php

@@ -104 +104 @@
         }
         // Path needs to be normalized to work in Windows env.
-        $wpinc_path_norm  = wp_normalize_path( ABSPATH . WPINC );
+        $wpinc_path_norm  = wp_normalize_path( realpath( ABSPATH . WPINC ) );
         $script_path_norm = wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $script_path ) );
         $is_core_block    = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], $wpinc_path_norm );
@@ -146 +146 @@
                 return false;
         }
-        $wpinc_path_norm = wp_normalize_path( ABSPATH . WPINC );
+        $wpinc_path_norm = wp_normalize_path( realpath( ABSPATH . WPINC ) );
         $is_core_block   = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], $wpinc_path_norm );
         if ( $is_core_block && ! wp_should_load_separate_core_block_assets() ) {
@@ -240 +240 @@
                 return false;
         }
-        $metadata['file'] = wp_normalize_path( $metadata_file );
+        $metadata['file'] = wp_normalize_path( realpath( $metadata_file ) );
 
         /**