Changeset 28623

Timestamp:

05/29/2014 08:49:28 PM (12 years ago)

Author:

wonderboymusic

Message:

Simplify the logic for determining isset( $this->query['s'] ) after [28612], and don't limit this logic to just the main query.

Props SergeyBiryukov.
Fixes #11330.

File:

• trunk/src/wp-includes/query.php (modified) (3 diffs)

trunk/src/wp-includes/query.php

@@ -1511 +1511 @@
                         $this->is_single = false;
                 } else {
-
-                // Look for archive queries. Dates, categories, authors, search, post type archives.
-                        if ( ! empty( $qv['s'] ) || ( $this->is_main_query() && array_key_exists( 's', $this->query ) ) )
+                        // Look for archive queries. Dates, categories, authors, search, post type archives.
+
+                        if ( isset( $this->query['s'] ) ) {
                                 $this->is_search = true;
+                        }
 
                         if ( '' !== $qv['second'] ) {
@@ -2262 +2263 @@
                 }
 
-                if ( $this->is_search ) {
-                        $search = 'AND 0';
-                }
-
                 if ( $this->is_feed ) {
                         // This overrides posts_per_page.
@@ -2478 +2475 @@
 
                 // If a search pattern is specified, load the posts that match.
-                if ( ! empty( $q['s'] ) )
+                if ( ! empty( $q['s'] ) ) {
                         $search = $this->parse_search( $q );
+                } elseif ( $this->is_search ) {
+                        $search = 'AND 0';
+                }
 
                 /**