Changeset 53930 for branches/6.0/src/wp-includes/blocks/post-template.php

Timestamp:

08/23/2022 03:52:08 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Editor: Backport bug fixes from Gutenberg into Core for WP 6.0.2 RC.

This brings a new version of the Gutenberg code from the ​wp/6.0 branch into core.

• @wordpress/block-directory@3.4.14
• @wordpress/block-editor@8.5.10
• @wordpress/block-library@7.3.14
• @wordpress/customize-widgets@3.3.14
• @wordpress/edit-post@6.3.14
• @wordpress/edit-site@4.3.14
• @wordpress/edit-widgets@4.3.14
• @wordpress/editor@12.5.10
• @wordpress/format-library@3.4.10
• @wordpress/reusable-blocks@3.4.10
• @wordpress/widgets@2.4.10

Props gziolo, SergeyBiryukov.
Merges [53929] to the 6.0 branch.
Fixes #56414.

Location:

branches/6.0

Files:

• . (modified) (1 prop)
• src/wp-includes/blocks/post-template.php (modified) (2 diffs)

branches/6.0/src/wp-includes/blocks/post-template.php

@@ -45 +45 @@
         $page     = empty( $_GET[ $page_key ] ) ? 1 : (int) $_GET[ $page_key ];
 
-        $query_args = build_query_vars_from_query_block( $block, $page );
-        // Override the custom query with the global query if needed.
+        // Use global query if needed.
         $use_global_query = ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] );
         if ( $use_global_query ) {
                 global $wp_query;
-                if ( $wp_query && isset( $wp_query->query_vars ) && is_array( $wp_query->query_vars ) ) {
-                        // Unset `offset` because if is set, $wp_query overrides/ignores the paged parameter and breaks pagination.
-                        unset( $query_args['offset'] );
-                        $query_args = wp_parse_args( $wp_query->query_vars, $query_args );
-
-                        if ( empty( $query_args['post_type'] ) && is_singular() ) {
-                                $query_args['post_type'] = get_post_type( get_the_ID() );
-                        }
-                }
+                $query = clone $wp_query;
+        } else {
+                $query_args = build_query_vars_from_query_block( $block, $page );
+                $query      = new WP_Query( $query_args );
         }
-
-        $query = new WP_Query( $query_args );
 
         if ( ! $query->have_posts() ) {
@@ -108 +100 @@
         }
 
+        /*
+         * Use this function to restore the context of the template tags
+         * from a secondary query loop back to the main query loop.
+         * Since we use two custom loops, it's safest to always restore.
+        */
         wp_reset_postdata();