Changeset 52291

Timestamp:

11/30/2021 08:00:09 PM (3 years ago)

Author:

audrasjb

Message:

Editor: Avoid a JS console error on the Navigation block view.

Props mkaz, sabernhardt, costdev.
Fixes #54456.

File:

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

trunk/src/wp-includes/blocks.php

@@ -84 +84 @@
 
     $script_handle     = generate_block_asset_handle( $metadata['name'], $field_name );
-    $script_asset_path = realpath(
-        dirname( $metadata['file'] ) . '/' .
-        substr_replace( $script_path, '.asset.php', - strlen( '.js' ) )
+    $script_asset_path = wp_normalize_path(
+        realpath(
+            dirname( $metadata['file'] ) . '/' .
+            substr_replace( $script_path, '.asset.php', - strlen( '.js' ) )
+        )
     );
     if ( ! file_exists( $script_asset_path ) ) {
@@ -101 +103 @@
         return false;
     }
-    $is_core_block       = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], ABSPATH . WPINC );
+    // Path needs to be normalized to work in Windows env.
+    $wpinc_path_norm     = wp_normalize_path( 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 );
+
     $script_uri          = $is_core_block ?
-        includes_url( str_replace( ABSPATH . WPINC, '', realpath( dirname( $metadata['file'] ) . '/' . $script_path ) ) ) :
+        includes_url( str_replace( $wpinc_path_norm, '', $script_path_norm ) ) :
         plugins_url( $script_path, $metadata['file'] );
     $script_asset        = require $script_asset_path;
@@ -140 +146 @@
         return false;
     }
-    $is_core_block = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], ABSPATH . WPINC );
+    $wpinc_path_norm = wp_normalize_path( 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() ) {
         return false;
@@ -233 +240 @@
         return false;
     }
-    $metadata['file'] = $metadata_file;
+    $metadata['file'] = wp_normalize_path( $metadata_file );
 
     /**