Changeset 53929 for trunk/src/wp-includes/blocks/query-no-results.php

Timestamp:

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

Author:

gziolo

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 SergeyBiryukov.
Fixes #56414.

File:

• trunk/src/wp-includes/blocks/query-no-results.php (modified) (2 diffs)

trunk/src/wp-includes/blocks/query-no-results.php

@@ -20 +20 @@
         }
 
-        $page_key   = isset( $block->context['queryId'] ) ? 'query-' . $block->context['queryId'] . '-page' : 'query-page';
-        $page       = empty( $_GET[ $page_key ] ) ? 1 : (int) $_GET[ $page_key ];
-        $query_args = build_query_vars_from_query_block( $block, $page );
+        $page_key = isset( $block->context['queryId'] ) ? 'query-' . $block->context['queryId'] . '-page' : 'query-page';
+        $page     = empty( $_GET[ $page_key ] ) ? 1 : (int) $_GET[ $page_key ];
+
         // Override the custom query with the 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 ) ) {
-                        $query_args = wp_parse_args( $wp_query->query_vars, $query_args );
-                }
+                $query = $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() ) {
@@ -37 +37 @@
         }
 
-        wp_reset_postdata();
+        if ( ! $use_global_query ) {
+                wp_reset_postdata();
+        }
 
         return sprintf(