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

Timestamp:

10/12/2023 01:55:27 PM (21 months ago)

Author:

hellofromTonya

Message:

Editor: Update npm packages ahead of 6.4 RC1.

Updates the npm packages and code for:

• ​List: fix forward merging of nested list

• ​Update consent string for using private APIs.

• ​useBlockSettings: add missing useMemo dependencies

• ​Remove the lightbox filter and view file when the lightbox setting is disabled.

• ​Patterns: Remove the version enforcement for npm in engines field

• ​Remove `@return void` from PHP function docs

• ​Image: Disable lightbox editor UI for linked images

• ​Image: Stop crashing with Lightbox on image blocks without an image

• ​Update fullscreen icon

• ​Template Part block: Fall back to current theme if no theme attribute is given. This change is part of fix for a performance regression re-introduced by [56818].

References:

• ​Gutenberg PR 55298 Cherry-pick commits

Follow-up to [56818], [56816].

Props ellatrix, peterwilsoncc, jsnajdr, afercia, gziolo, isabel_brison, artemiosans, richtabor, bernhard-reiter, flixos90, mikachan, spacedmonkey, hellofromTonya.
See #59583, #59411.

File:

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

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

@@ -19 +19 @@
     $content          = null;
     $area             = WP_TEMPLATE_PART_AREA_UNCATEGORIZED;
-
-    if (
-        isset( $attributes['slug'] ) &&
-        isset( $attributes['theme'] ) &&
-        get_stylesheet() === $attributes['theme']
-    ) {
-        $template_part_id    = $attributes['theme'] . '//' . $attributes['slug'];
+    $theme            = isset( $attributes['theme'] ) ? $attributes['theme'] : get_stylesheet();
+
+    if ( isset( $attributes['slug'] ) && get_stylesheet() === $theme ) {
+        $template_part_id    = $theme . '//' . $attributes['slug'];
         $template_part_query = new WP_Query(
             array(
@@ -35 +32 @@
                         'taxonomy' => 'wp_theme',
                         'field'    => 'name',
-                        'terms'    => $attributes['theme'],
+                        'terms'    => $theme,
                     ),
                 ),