Changeset 56527

Timestamp:

09/06/2023 09:22:28 PM (11 months ago)

Author:

azaozz

Message:

Editor: Fix loading of assets in blocks in child themes where the directory name starts with the parent theme's directory name. Example: twentyseventeen and twentyseventeen-child.

Props: lgladdy, masteradhoc, audrasjb, rajinsharwar, azaozz.
Fixes: #59018.

Location:

trunk

Files:

• src/wp-includes/blocks.php (modified) (2 diffs)
• tests/phpunit/tests/blocks/register.php (modified) (2 diffs)

trunk/src/wp-includes/blocks.php

@@ -151 +151 @@
      * the parent (template) or child (stylesheet) directory path.
      */
-    $is_parent_theme_block = str_starts_with( $script_path_norm, $template_path_norm );
-    $is_child_theme_block  = str_starts_with( $script_path_norm, $stylesheet_path_norm );
+    $is_parent_theme_block = str_starts_with( $script_path_norm,  );
+    $is_child_theme_block  = str_starts_with( $script_path_norm,  );
     $is_theme_block        = ( $is_parent_theme_block || $is_child_theme_block );
 
@@ -271 +271 @@
         // Determine if the block style was registered in a theme, by checking if the script path starts with either
         // the parent (template) or child (stylesheet) directory path.
-        $is_parent_theme_block = str_starts_with( $style_path_norm, $template_path_norm );
-        $is_child_theme_block  = str_starts_with( $style_path_norm, $stylesheet_path_norm );
+        $is_parent_theme_block = str_starts_with( $style_path_norm,  );
+        $is_child_theme_block  = str_starts_with( $style_path_norm,  );
         $is_theme_block        = ( $is_parent_theme_block || $is_child_theme_block );
 

trunk/tests/phpunit/tests/blocks/register.php

@@ -271 +271 @@
 
         $this->assertSame( 'unit-tests-test-block-script', $result );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 
@@ -438 +453 @@
             wp_normalize_path( realpath( DIR_TESTDATA . '/blocks/notice/block.css' ) ),
             wp_normalize_path( wp_styles()->get_data( 'unit-tests-test-block-style', 'path' ) )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         );
     }