Merge pull request #712 from GoogleChromeLabs/fix/main-query-check-fo…

…r-unauthenticating-user

Only unauthenticate user when `parse_query` is for the main query

tests/test-general-template.php

@@ -75,4 +75,24 @@ public function test_wp_unauthenticate_error_template_requests( $request_url, $a
 			$this->assertEquals( 0, get_current_user_id() );
 		}
 	}
+
+	/**
+	 * Test that that `wp_unauthenticate_error_template_requests()` running at the `parse_query` action doesn't cause
+	 * an incorrect usage notice if there is not global `$wp_query` yet, such as when doing a subquery early in the WP
+	 * execution flow.
+	 *
+	 * @covers ::wp_unauthenticate_error_template_requests()
+	 */
+	public function test_wp_unauthenticate_error_template_requests_for_subqueries() {
+		global $wp_query;
+		$wp_query = null;
+
+		$user_id = $this->factory()->user->create( array( 'role' => 'author' ) );
+		wp_set_current_user( $user_id );
+
+		$query = new WP_Query();
+		$query->parse_query( 's=test' );
+
+		$this->assertTrue( is_user_logged_in() );
+	}
 }

wp-includes/general-template.php

@@ -123,9 +123,11 @@ function wp_add_error_template_no_robots() {
  * will persist even after they have authenticated.
  *
  * @since 0.5
+ *
+ * @param WP_Query $query Query.
  */
-function wp_unauthenticate_error_template_requests() {
-	if ( is_offline() || is_500() ) {
+function wp_unauthenticate_error_template_requests( WP_Query $query ) {
+	if ( $query->is_main_query() && ( is_offline() || is_500() ) ) {
 		wp_set_current_user( 0 );
 	}
 }