Changeset 4997

Timestamp:

06/24/2013 03:57:07 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Make search results page use pretty permalinks if they are enabled:

• Change search form method from "get" to "post"
• Move 'bbp_search_request_redirect' action to 'bbp_post_request' to avoid recursion.
• Tweak bbp_search_request_redirect() to check for pretty permalinks, and remove now superfluous recursion checks.
• See #2337.

Location:

trunk

Files:

• includes/core/actions.php (modified) (1 diff)
• includes/search/functions.php (modified) (2 diffs)
• templates/default/bbpress/form-search.php (modified) (1 diff)

trunk/includes/core/actions.php

@@ -284 +284 @@
 
 // Theme-side POST requests
-add_action( 'bbp_post_request', 'bbp_do_ajax',                1  );
-add_action( 'bbp_post_request', 'bbp_edit_topic_tag_handler', 1  );
-add_action( 'bbp_post_request', 'bbp_edit_user_handler',      1  );
-add_action( 'bbp_post_request', 'bbp_edit_forum_handler',     1  );
-add_action( 'bbp_post_request', 'bbp_edit_reply_handler',     1  );
-add_action( 'bbp_post_request', 'bbp_edit_topic_handler',     1  );
-add_action( 'bbp_post_request', 'bbp_merge_topic_handler',    1  );
-add_action( 'bbp_post_request', 'bbp_split_topic_handler',    1  );
-add_action( 'bbp_post_request', 'bbp_move_reply_handler',     1  );
-add_action( 'bbp_post_request', 'bbp_new_forum_handler',      10 );
-add_action( 'bbp_post_request', 'bbp_new_reply_handler',      10 );
-add_action( 'bbp_post_request', 'bbp_new_topic_handler',      10 );
+add_action( 'bbp_post_request', 'bbp_do_ajax',                 1  );
+add_action( 'bbp_post_request', 'bbp_edit_topic_tag_handler',  1  );
+add_action( 'bbp_post_request', 'bbp_edit_user_handler',       1  );
+add_action( 'bbp_post_request', 'bbp_edit_forum_handler',      1  );
+add_action( 'bbp_post_request', 'bbp_edit_reply_handler',      1  );
+add_action( 'bbp_post_request', 'bbp_edit_topic_handler',      1  );
+add_action( 'bbp_post_request', 'bbp_merge_topic_handler',     1  );
+add_action( 'bbp_post_request', 'bbp_split_topic_handler',     1  );
+add_action( 'bbp_post_request', 'bbp_move_reply_handler',      1  );
+add_action( 'bbp_post_request', 'bbp_new_forum_handler',       10 );
+add_action( 'bbp_post_request', 'bbp_new_reply_handler',       10 );
+add_action( 'bbp_post_request', 'bbp_new_topic_handler',       10 );
+add_action( 'bbp_post_request', 'bbp_search_results_redirect', 10 );
 
 // Theme-side GET requests

trunk/includes/search/functions.php

@@ -50 +50 @@
     // Get search terms
     $search_terms = bbp_get_search_terms();
-    $retval = !empty( $search_terms ) ? array( 's' => $search_terms ) : array();
+    $retval       = !empty( $search_terms ) ? array( 's' => $search_terms ) : array();
 
     return apply_filters( 'bbp_get_search_query_args', $retval );
@@ -61 +61 @@
  * @return If a redirect is not needed
  */
-function bbp_search_template_redirect() {
-
-    // Bail if already on search results page
-    if ( bbp_is_search_results() )
+function bbp_search_results_redirect() {
+    global $wp_rewrite;
+    
+    // Bail if not using pretty permalinks
+    if ( ! $wp_rewrite->using_permalinks() ) {
         return;
-
-    // Bail if search terms are empty
-    if ( false === bbp_get_search_terms() )
-        return;
+    }
 
     // Get the redirect URL
     $redirect_to = bbp_get_search_results_url();
-
-    // Bail if no redirect URL or may cause infinite loop
-    if ( empty( $redirect_to ) || ( bbp_get_search_url() === $redirect_to ) )
+    if ( empty( $redirect_to ) ) {
         return;
+    }
 
     // Redirect and bail

trunk/templates/default/bbpress/form-search.php

@@ -10 +10 @@
 ?>
 
-<form role="search" method="get" id="bbp-search-form" action="<?php bbp_search_url(); ?>">
+<form role="search" method="post" id="bbp-search-form" action="<?php bbp_search_url(); ?>">
     <div>
         <label class="screen-reader-text hidden" for="bbp_search"><?php _e( 'Search for:', 'bbpress' ); ?></label>