Changeset 10110 for trunk/src/bp-groups/bp-groups-template.php

Timestamp:

09/14/2015 03:39:38 PM (10 years ago)

Author:

boonebgorges

Message:

When a copmonent directory is set to the front page, don't interfere with blog searches.

WP's default search query arg is 's', so that URLs like example.com?s=foo lead
to a search of blog posts on the term 'foo'. When a BuddyPress component page
like Members is set to the front page, it interferes with this behavior in two
ways: (1) BuddyPress interprets example.com?s=foo as a Members directory
request, and (2) the 's' query arg is interpreted as a Members search term.

We fix this conflict as follows:

• During the URL parsing process, don't interpret requests of the form example.com?s=foo as being BP component requests, even if a BP component is set to the front page.
• In order to make BuddyPress component searches continue to work, we change the default search query arguments for each component to be unique. For example, member directory searches look like example.com?members_search=foo. Components register their own 'search_query_arg', and these args can be filtered with the new 'bp_core_get_component_search_query_arg' filter.

Fixes #5087.

File:

• trunk/src/bp-groups/bp-groups-template.php (modified) (3 diffs)

trunk/src/bp-groups/bp-groups-template.php

@@ -487 +487 @@
  *                                         to groups of which the specified user
  *                                         is a member. Default: null.
- *     @type string       $search_terms    If provided, only groups whose names or descriptions
- *                                         match the search terms will be returned. Default: false.
+ *     @type string       $search_terms    If provided, only groups whose names or descriptions match the search terms
+ *                                         will be returned. Default: value of `$_REQUEST['groups_search']` or
+ *                                         `$_REQUEST['s']`, if present. Otherwise false.
  *     @type array        $meta_query      An array of meta_query conditions.
  *                                         See {@link WP_Meta_Query::queries} for description.
@@ -534 +535 @@
 
     // Default search string (too soon to escape here)
-    if ( ! empty( $_REQUEST['group-filter-box'] ) ) {
+    $search_query_arg = bp_core_get_component_search_query_arg( 'groups' );
+    if ( ! empty( $_REQUEST[ $search_query_arg ] ) ) {
+        $search_terms = stripslashes( $_REQUEST[ $search_query_arg ] );
+    } elseif ( ! empty( $_REQUEST['group-filter-box'] ) ) {
         $search_terms = $_REQUEST['group-filter-box'];
     } elseif ( !empty( $_REQUEST['s'] ) ) {
@@ -4979 +4983 @@
 function bp_directory_groups_search_form() {
 
-    $default_search_value = bp_get_search_default_text( 'groups' );
-    $search_value         = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value;
+    $query_arg = bp_core_get_component_search_query_arg( 'groups' );
+
+    if ( ! empty( $_REQUEST[ $query_arg ] ) ) {
+        $search_value = stripslashes( $_REQUEST[ $query_arg ] );
+    } else {
+        $search_value = bp_get_search_default_text( 'groups' );
+    }
 
     $search_form_html = '<form action="" method="get" id="search-groups-form">
-        <label><input type="text" name="s" id="groups_search" placeholder="'. esc_attr( $search_value ) .'" /></label>
+        <label><input type="text" name="' . esc_attr( $query_arg ) . '" id="groups_search" placeholder="'. esc_attr( $search_value ) .'" /></label>
         <input type="submit" id="groups_search_submit" name="groups_search_submit" value="'. __( 'Search', 'buddypress' ) .'" />
     </form>';