From 01040717aae83587113a3b5afd19a43d777d45b6 Mon Sep 17 00:00:00 2001
From: spacedmonkey <spacedmonkey@git.wordpress.org>
Date: Wed, 2 Mar 2022 15:12:02 +0000
Subject: [PATCH] Bootstrap/Load: Stop unnecessary queries when using the
 `do_parse_request` filter.

Developers of plugins and themes can use the `do_parse_request` filter to hot-wire requests and hook in early to render custom pages. However, even through these request may not need post queries and 404 lookups to be run, they run anyway. This can results in unnecessary SQL queries running on these requests. By adding a return value to the `parse_request` method of the `WP` class, these queries can now be skipped.

Props junsuijin, ryan, westi, sivel, dd32, wonderboymusic, arnee, tyxla, DrewAPicture, lukecavanagh, SergeyBiryukov, davidbaumwald, Spacedmonkey, pbearne.
Fixes #10886.


Built from https://develop.svn.wordpress.org/trunk@52814


git-svn-id: http://core.svn.wordpress.org/trunk@52403 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp.php | 16 ++++++++++------
 wp-includes/version.php  |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/wp-includes/class-wp.php b/wp-includes/class-wp.php
index 9765a01507..35ebb06371 100644
--- a/wp-includes/class-wp.php
+++ b/wp-includes/class-wp.php
@@ -129,6 +129,7 @@ class WP {
 	 * @global WP_Rewrite $wp_rewrite WordPress rewrite component.
 	 *
 	 * @param array|string $extra_query_vars Set the extra query variables.
+	 * @return bool Whether the request was parsed.
 	 */
 	public function parse_request( $extra_query_vars = '' ) {
 		global $wp_rewrite;
@@ -143,7 +144,7 @@ class WP {
 		 * @param array|string $extra_query_vars Extra passed query variables.
 		 */
 		if ( ! apply_filters( 'do_parse_request', true, $this, $extra_query_vars ) ) {
-			return;
+			return false;
 		}
 
 		$this->query_vars     = array();
@@ -394,6 +395,8 @@ class WP {
 		 * @param WP $wp Current WordPress environment instance (passed by reference).
 		 */
 		do_action_ref_array( 'parse_request', array( &$this ) );
+
+		return true;
 	}
 
 	/**
@@ -755,12 +758,13 @@ class WP {
 	 */
 	public function main( $query_args = '' ) {
 		$this->init();
-		$this->parse_request( $query_args );
+		$parsed = $this->parse_request( $query_args );
 		$this->send_headers();
-		$this->query_posts();
-		$this->handle_404();
-		$this->register_globals();
-
+		if ( $parsed ) {
+			$this->query_posts();
+			$this->handle_404();
+			$this->register_globals();
+		}
 		/**
 		 * Fires once the WordPress environment has been set up.
 		 *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4f17941fa6..1b0e33d60f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.0-alpha-52813';
+$wp_version = '6.0-alpha-52814';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.