Changeset 52364 for trunk/src/wp-includes/blocks/template-part.php

Timestamp:

12/14/2021 01:55:28 AM (3 years ago)

Author:

noisysocks

Message:

Update @wordpress packages

Update packages to include these bug fixes from Gutenberg:

• Image block: Set image display to grid when no alignment sent to properly align caption on resize
• Update and align template descriptions
• Site Editor - prevent loading state from showing the admin menu.
• Add client side routing for Site Editor
• Navigation: Add clearance for appender in submenus.
• Fix CSS Custom Properties for presets in the site editor
• Add/navigation blocks post processing after migration from menu items
• Allow selector ordering to ensure theme.json root selector margin takes precedence
• Do not remove theme presets if defaults are hidden
• Format library: fix unsetting highlight color
• FSE: Fix template resolution to give precedence to child theme PHP templates over parent theme block templates with equal specificity
• ColorPalette: Improving accessibility and visibility
• Update: Make the color popover on the gradient picker appear as expected
• Site Editor: Display a notice if export fails
• Fix docs and function naming for gallery block registration in PHP
• Switch to addEventListener for load event in the navigation block view script
• Fix mistake in _remove_theme_attribute_in_block_template_content
• Better synchronisation between Gutenberg and Core code
• Move the block page templates hook into compat/5.9 folder
• Moves to the template loader hooks and functions into lib/compat folder
• Refactor the gutenberg_is_fse_theme function to use wp_is_block_theme
• Site Editor: Update support doc URL in Welcome Guide
• Global Styles: Add Welcome Guide toggle
• Hide remove control point when removing would break gradient control
• Don't request the deprecated navigation areas endpoint outside of the Gutenberg plugin
• Image: Fix resizer controls being hidden in Safari when switching between alignments
• Remove Navigation Menus from WP Admin sidebar
• Site Editor: Hide the block appender in the Template Part editor
• Site Editor: Use server definition for the Template Areas
• Synchronize wp_is_block_theme and block-templates block support with Core
• E2E: Retry login again after a bad nonce request to prevent intermittent test failures
• Fix theme requirement validation with WP 5.8
• Fix WP 5.9 check for conditionally running code
• Fix post comment form input width
• Border Style Control: Update styling for consistency with border width control
• Fix form-submit styles by adding button classes to the submit-button in post-comments block
• Site Editor: Fix edit template part link in header dropdown
• Move duotone palette to the bottom of global styles gradients
• Fix how appearanceTools works
• Move WP 5.9 wp-admin menus compatibility code to lib/compat folder
• Revert "Site Editor: Set the <title> on the list page to be same as the CPT name"
• Site Editor: Document Actions: add SR text to heading 1
• Do not register global styles CPT in WordPress 5.9
• Global Styles: Move the 'Edit colors' button to a standard menu item
• Fix styles for previews and patterns
• Site Editor: Fix failing E2E test
• Templates: Search for old template names in the parent theme too
• Remove 4 instances of 'gutenberg' text domain from WordPress core
• Fix content loss when ungrouping template parts or reusable blocks
• Simplify the RESET_BLOCK action to fix template part focus mode content loss
• [Global Styles]: Make Blocks section more distinguishable
• Only use block markup for comment form button when using a block theme
• Navigation: Fix vertical alignment of page list in modal.
• Fix: ToggleGroupControl active state
• Remove gutenberg_ prefix from @wordpress/block-library

Props ocean90, oandregal, hellofromtonya, youknowriad.
See #54487.

File:

• trunk/src/wp-includes/blocks/template-part.php (modified) (1 diff)

trunk/src/wp-includes/blocks/template-part.php

@@ -65 +65 @@
             // Else, if the template part was provided by the active theme,
             // render the corresponding file content.
-            $theme_folders           = get_block_theme_folders();
-            $template_part_file_path = get_theme_file_path( '/' . $theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' );
+            $parent_theme_folders        = get_block_theme_folders( get_template() );
+            $child_theme_folders         = get_block_theme_folders( get_stylesheet() );
+            $child_theme_part_file_path  = get_theme_file_path( '/' . $child_theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' );
+            $parent_theme_part_file_path = get_theme_file_path( '/' . $parent_theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' );
+            $template_part_file_path     = 0 === validate_file( $attributes['slug'] ) && file_exists( $child_theme_part_file_path ) ? $child_theme_part_file_path : $parent_theme_part_file_path;
             if ( 0 === validate_file( $attributes['slug'] ) && file_exists( $template_part_file_path ) ) {
                 $content = file_get_contents( $template_part_file_path );