Changeset 5468 for trunk/src/includes/search/template.php

Timestamp:

09/08/2014 03:38:41 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Only add the s argument to global forum search queries if search-terms exist.

See #2607, ​#WP11330, ​[WP28623] ​[WP28612], ​[WP28804].

File:

• trunk/src/includes/search/template.php (modified) (3 diffs)

trunk/src/includes/search/template.php

@@ -44 +44 @@
     /** Defaults **************************************************************/
 
-    $default_post_type = array( bbp_get_forum_post_type(), bbp_get_topic_post_type(), bbp_get_reply_post_type() );
+    $default_search_terms = bbp_get_search_terms();
+    $default_post_type    = array( bbp_get_forum_post_type(), bbp_get_topic_post_type(), bbp_get_reply_post_type() );
 
     // Default query args
@@ -53 +54 @@
         'orderby'             => 'date',                     // Sorted by date
         'order'               => 'DESC',                     // Most recent first
-        'ignore_sticky_posts' => true,                       // Stickies not supported
-        's'                   => bbp_get_search_terms(),     // This is a search
+        'ignore_sticky_posts' => true                        // Stickies not supported
     );
+
+    // Only set 's' if search terms exist
+    // https://bbpress.trac.wordpress.org/ticket/2607
+    if ( false !== $default_search_terms ) {
+        $default['s'] = $default_search_terms;
+    }
 
     // What are the default allowed statuses (based on user caps)
@@ -89 +95 @@
     $bbp = bbpress();
 
-    // Call the query
+    // Only call the search query if 's' is not empty
     if ( ! empty( $r['s'] ) ) {
         $bbp->search_query = new WP_Query( $r );