Changeset 4999

Timestamp:

06/24/2013 05:09:00 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Since search requests get existing data, and do not post new data, revert part of r4997 and switch request method back to "get".

Add hidden 'action' field to form-search.php template-part, and move 'bbp_search_results_redirect' action from 'bbp_post_request' to 'bbp_get_request'.

Fixes issue with request not redirecting properly, and uses more accurate form method. See #2337.

Location:

trunk

Files:

• includes/core/actions.php (modified) (1 diff)
• 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_search_results_redirect', 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 );
 
 // Theme-side GET requests
-add_action( 'bbp_get_request', 'bbp_toggle_topic_handler',   1  );
-add_action( 'bbp_get_request', 'bbp_toggle_reply_handler',   1  );
-add_action( 'bbp_get_request', 'bbp_favorites_handler',      1  );
-add_action( 'bbp_get_request', 'bbp_subscriptions_handler',  1  );
+add_action( 'bbp_get_request', 'bbp_toggle_topic_handler',    1  );
+add_action( 'bbp_get_request', 'bbp_toggle_reply_handler',    1  );
+add_action( 'bbp_get_request', 'bbp_favorites_handler',       1  );
+add_action( 'bbp_get_request', 'bbp_subscriptions_handler',   1  );
+add_action( 'bbp_get_request', 'bbp_search_results_redirect', 10 );
 
 // Maybe convert the users password

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

@@ -10 +10 @@
 ?>
 
-<form role="search" method="post" id="bbp-search-form" action="<?php bbp_search_url(); ?>">
+<form role="search" method="get" 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>
+        <input type="hidden" name="action" value="bbp-search-request" />
         <input tabindex="<?php bbp_tab_index(); ?>" type="text" value="<?php echo esc_attr( bbp_get_search_terms() ); ?>" name="bbp_search" id="bbp_search" />
         <input tabindex="<?php bbp_tab_index(); ?>" class="button" type="submit" id="bbp_search_submit" value="<?php esc_attr_e( 'Search', 'bbpress' ); ?>" />