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

Timestamp:

06/27/2023 02:20:18 PM (3 years ago)

Author:

Bernhard Reiter

Message:

Editor: update Wordpress npm packages.

Updates the wordpress npm packages and their dependencies to the latest versions, as well as auto-updates to relevant core PHP files.

Props youknowriad, joemcgill, spacedmonkey, ramonopoly, peterwilsoncc, bernhard-reiter, tyxla, dmsnell.
Fixes #58623.

File:

• trunk/src/wp-includes/blocks/template-part.php (modified) (7 diffs)

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

@@ -19 +19 @@
         $content          = null;
         $area             = WP_TEMPLATE_PART_AREA_UNCATEGORIZED;
+        $stylesheet       = get_stylesheet();
 
         if (
                 isset( $attributes['slug'] ) &&
                 isset( $attributes['theme'] ) &&
-                get_stylesheet() === $attributes['theme']
+                $stylesheet === $attributes['theme']
         ) {
                 $template_part_id    = $attributes['theme'] . '//' . $attributes['slug'];
                 $template_part_query = new WP_Query(
                         array(
-                                'post_type'      => 'wp_template_part',
-                                'post_status'    => 'publish',
-                                'post_name__in'  => array( $attributes['slug'] ),
-                                'tax_query'      => array(
+                                'post_type'           => 'wp_template_part',
+                                'post_status'         => 'publish',
+                                'post_name__in'       => array( $attributes['slug'] ),
+                                'tax_query'           => array(
                                         array(
                                                 'taxonomy' => 'wp_theme',
@@ -38 +39 @@
                                         ),
                                 ),
-                                'posts_per_page' => 1,
-                                'no_found_rows'  => true,
+                                'posts_per_page'      => 1,
+                                'no_found_rows'       => true,
+                                'lazy_load_term_meta' => false, // Do not lazy load term meta, as template parts only have one term.
                         )
                 );
@@ -65 +67 @@
                         // Else, if the template part was provided by the active theme,
                         // render the corresponding file content.
-                        $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 );
-                                $content = is_string( $content ) && '' !== $content
-                                                ? _inject_theme_attribute_in_block_template_content( $content )
-                                                : '';
+                        if ( 0 === validate_file( $attributes['slug'] ) ) {
+                                $themes   = array( $stylesheet );
+                                $template = get_template();
+                                if ( $stylesheet !== $template ) {
+                                        $themes[] = $template;
+                                }
+
+                                foreach ( $themes as $theme ) {
+                                        $theme_folders           = get_block_theme_folders( $theme );
+                                        $template_part_file_path = get_theme_file_path( '/' . $theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' );
+                                        if ( file_exists( $template_part_file_path ) ) {
+                                                $content = (string) file_get_contents( $template_part_file_path );
+                                                $content = '' !== $content ? _inject_theme_attribute_in_block_template_content( $content ) : '';
+                                                break;
+                                        }
+                                }
                         }
 
@@ -173 +181 @@
  * Returns an array of area variation objects for the template part block.
  *
+ * @param array $instance_variations The variations for instances.
+ *
  * @return array Array containing the block variation objects.
  */
-function build_template_part_block_area_variations() {
+function build_template_part_block_area_variations( $instance_variations ) {
         $variations    = array();
         $defined_areas = get_allowed_block_template_part_areas();
+
         foreach ( $defined_areas as $area ) {
                 if ( 'uncategorized' !== $area['area'] ) {
+                        $has_instance_for_area = false;
+                        foreach ( $instance_variations as $variation ) {
+                                if ( $variation['attributes']['area'] === $area['area'] ) {
+                                        $has_instance_for_area = true;
+                                        break;
+                                }
+                        }
+
+                        $scope = $has_instance_for_area ? array() : array( 'inserter' );
+
                         $variations[] = array(
-                                'name'        => $area['area'],
+                                'name'        => 'area_' . $area['area'],
                                 'title'       => $area['label'],
                                 'description' => $area['description'],
@@ -187 +208 @@
                                         'area' => $area['area'],
                                 ),
-                                'scope'       => array( 'inserter' ),
+                                'scope'       => $scope,
                                 'icon'        => $area['icon'],
                         );
@@ -223 +244 @@
         foreach ( $template_parts as $template_part ) {
                 $variations[] = array(
-                        'name'        => sanitize_title( $template_part->slug ),
+                        'name'        => 'instance_' . sanitize_title( $template_part->slug ),
                         'title'       => $template_part->title,
                         // If there's no description for the template part don't show the
@@ -255 +276 @@
  */
 function build_template_part_block_variations() {
-        return array_merge( build_template_part_block_area_variations(), build_template_part_block_instance_variations() );
+        $instance_variations = build_template_part_block_instance_variations();
+        $area_variations     = build_template_part_block_area_variations( $instance_variations );
+        return array_merge( $area_variations, $instance_variations );
 }