Ticket #2607: 2607.02.patch

src/includes/replies/template.php

@@ -124 +124 @@
         /** Defaults **************************************************************/
 
         // 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() );
         $default_thread_replies = (bool) ( bbp_is_single_topic() && bbp_thread_replies() );
@@ -139 +138 @@
                 'order'               => 'ASC',                      // Oldest to newest
                 'hierarchical'        => $default_thread_replies,    // Hierarchical replies
                 'ignore_sticky_posts' => true,                       // Stickies not supported
-                's'                   => $default_reply_search,      // Maybe search
         );
 
         // What are the default allowed statuses (based on user caps)

src/includes/topics/template.php

@@ -143 +143 @@
         /** Defaults **************************************************************/
 
         // 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_show_stickies = (bool) ( bbp_is_single_forum() || bbp_is_topic_archive() );
         $default_post_parent   = bbp_is_single_forum() ? bbp_get_forum_id() : 'any';
 
         // Default argument array
@@ -157 +156 @@
                 'order'          => 'DESC',                    // 'ASC', 'DESC'
                 '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
         );