Make WordPress Core


Ignore:
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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/blocks.php

    r56455 r56527  
    151151     * the parent (template) or child (stylesheet) directory path.
    152152     */
    153     $is_parent_theme_block = str_starts_with( $script_path_norm, $template_path_norm );
    154     $is_child_theme_block  = str_starts_with( $script_path_norm, $stylesheet_path_norm );
     153    $is_parent_theme_block = str_starts_with( $script_path_norm, trailingslashit( $template_path_norm ) );
     154    $is_child_theme_block  = str_starts_with( $script_path_norm, trailingslashit( $stylesheet_path_norm ) );
    155155    $is_theme_block        = ( $is_parent_theme_block || $is_child_theme_block );
    156156
     
    271271        // Determine if the block style was registered in a theme, by checking if the script path starts with either
    272272        // the parent (template) or child (stylesheet) directory path.
    273         $is_parent_theme_block = str_starts_with( $style_path_norm, $template_path_norm );
    274         $is_child_theme_block  = str_starts_with( $style_path_norm, $stylesheet_path_norm );
     273        $is_parent_theme_block = str_starts_with( $style_path_norm, trailingslashit( $template_path_norm ) );
     274        $is_child_theme_block  = str_starts_with( $style_path_norm, trailingslashit( $stylesheet_path_norm ) );
    275275        $is_theme_block        = ( $is_parent_theme_block || $is_child_theme_block );
    276276
Note: See TracChangeset for help on using the changeset viewer.