Changeset 5467

Timestamp:

09/08/2014 03:05:19 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Only add the s argument to queries if rs or ts are set in their respective topics & replies queries.

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

Location:

trunk/src/includes

Files:

• replies/template.php (modified) (2 diffs)
• topics/template.php (modified) (2 diffs)

trunk/src/includes/replies/template.php

@@ -125 +125 @@
 
     // Other defaults
-    $default_reply_search   = !empty( $_REQUEST['rs'] ) ? $_REQUEST['rs']    : false;
     $default_post_parent    = ( bbp_is_single_topic() ) ? bbp_get_topic_id() : 'any';
     $default_post_type      = ( bbp_is_single_topic() && bbp_show_lead_topic() ) ? bbp_get_reply_post_type() : array( bbp_get_topic_post_type(), bbp_get_reply_post_type() );
@@ -140 +139 @@
         'hierarchical'        => $default_thread_replies,    // Hierarchical replies
         'ignore_sticky_posts' => true,                       // Stickies not supported
-        's'                   => $default_reply_search,      // Maybe search
     );
+
+    // Only add 's' arg if searching for replies
+    // See https://bbpress.trac.wordpress.org/ticket/2607
+    if ( ! empty( $_REQUEST['rs'] ) ) {
+        $default['s'] = $_REQUEST['rs'];
+    }
 
     // What are the default allowed statuses (based on user caps)

trunk/src/includes/topics/template.php

@@ -145 +145 @@
 
     // Other defaults
-    $default_topic_search  = ! empty( $_REQUEST['ts'] ) ? $_REQUEST['ts'] : false;
     $default_show_stickies = (bool) ( bbp_is_single_forum() || bbp_is_topic_archive() ) && ( false === $default_topic_search );
     $default_post_parent   = bbp_is_single_forum() ? bbp_get_forum_id() : 'any';
@@ -159 +158 @@
         'posts_per_page' => bbp_get_topics_per_page(), // Topics per page
         'paged'          => bbp_get_paged(),           // Page Number
-        's'              => $default_topic_search,     // Topic Search
         'show_stickies'  => $default_show_stickies,    // Ignore sticky topics?
         'max_num_pages'  => false,                     // Maximum number of pages to show
     );
+
+    // Only add 's' arg if searching for topics
+    // See https://bbpress.trac.wordpress.org/ticket/2607
+    if ( ! empty( $_REQUEST['ts'] ) ) {
+        $default['s'] = $_REQUEST['ts'];
+    }
 
     // What are the default allowed statuses (based on user caps)