Changeset 56776

Timestamp:

10/04/2023 06:45:16 PM (3 years ago)

Author:

audrasjb

Message:

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

Props lgladdy, masteradhoc, audrasjb, rajinsharwar, azaozz.
Merges [56527] to the 6.3 branch.
Fixes #59018.

Location:

branches/6.3

Files:

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

branches/6.3/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, trailingslashit( $template_path_norm ) );
+        $is_child_theme_block  = str_starts_with( $script_path_norm, trailingslashit( $stylesheet_path_norm ) );
         $is_theme_block        = ( $is_parent_theme_block || $is_child_theme_block );
 
@@ -262 +262 @@
                 // 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, trailingslashit( $template_path_norm ) );
+                $is_child_theme_block  = str_starts_with( $style_path_norm, trailingslashit( $stylesheet_path_norm ) );
                 $is_theme_block        = ( $is_parent_theme_block || $is_child_theme_block );
 

branches/6.3/tests/phpunit/tests/blocks/register.php

@@ -271 +271 @@
 
                 $this->assertSame( 'unit-tests-test-block-script', $result );
+
+                // Test the behavior directly within the unit test
+                $this->assertFalse(
+                        strpos(
+                                wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $metadata['script'] ) ),
+                                trailingslashit( wp_normalize_path( get_template_directory() ) )
+                        ) === 0
+                );
+
+                $this->assertFalse(
+                        strpos(
+                                wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $metadata['script'] ) ),
+                                trailingslashit( wp_normalize_path( get_stylesheet_directory() ) )
+                        ) === 0
+                );
         }
 
@@ -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' ) )
+                );
+
+                // Test the behavior directly within the unit test
+                $this->assertFalse(
+                        strpos(
+                                wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $metadata['style'] ) ),
+                                trailingslashit( wp_normalize_path( get_template_directory() ) )
+                        ) === 0
+                );
+
+                $this->assertFalse(
+                        strpos(
+                                wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $metadata['style'] ) ),
+                                trailingslashit( wp_normalize_path( get_stylesheet_directory() ) )
+                        ) === 0
                 );
         }