Changeset 28612

Timestamp:

05/29/2014 05:47:35 AM (10 years ago)

Author:

wonderboymusic

Message:

When parsing the main query, if s is set to empty: ?s= and $this->is_main_query() && array_key_exists( 's', $this->query ) - kill the query instead of loading the homepage. This will load the search page with no results.

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']) ) {
+            if ( ! empty( $qv['s'] ) || ( $this->is_main_query() && array_key_exists( 's', $this->query ) ) )
                 $this->is_search = true;
-            }
 
             if ( '' !== $qv['second'] ) {
@@ -2262 +2261 @@
             }
         }
+
+        if ( $this->is_search ) {
+            $search = 'AND 0';
+        }
+
         if ( $this->is_feed ) {
             // This overrides posts_per_page.
@@ -2877 +2881 @@
 
         // Comments feeds
-        if ( $this->is_comment_feed && ( $this->is_archive || $this->is_search || !$this->is_singular ) ) {
+        if ( $this->is_comment_feed && ( $this->is_archive || ( $this->is_search && ! empty( $q['s'] ) ) || !$this->is_singular ) ) {
             if ( $this->is_archive || $this->is_search ) {
                 $cjoin = "JOIN $wpdb->posts ON ($wpdb->comments.comment_post_ID = $wpdb->posts.ID) $join ";