Changeset 10110 for trunk/src/bp-members/bp-members-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-members/bp-members-template.php (modified) (4 diffs)

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

@@ -532 +532 @@
  *     @type string|array          $member_type__not_in Array or comma-separated list of member types to exclude
  *                                                      from results.
- *     @type string                $search_terms        Limit results by a search term. Default: null.
+ *     @type string                $search_terms        Limit results by a search term. Default: value of
+ *                                                      `$_REQUEST['members_search']` or `$_REQUEST['s']`, if present.
+ *                                                      Otherwise false.
  *     @type string                $meta_key            Limit results by the presence of a usermeta key.
  *                                                      Default: false.
@@ -563 +565 @@
     }
 
+    $search_terms_default = null;
+    $search_query_arg = bp_core_get_component_search_query_arg( 'members' );
+    if ( ! empty( $_REQUEST[ $search_query_arg ] ) ) {
+        $search_terms_default = stripslashes( $_REQUEST[ $search_query_arg ] );
+    }
+
     // type: active ( default ) | random | newest | popular | online | alphabetical
     $r = bp_parse_args( $args, array(
@@ -579 +587 @@
         'member_type__in'     => '',
         'member_type__not_in' => '',
-        'search_terms'        => null,     // Pass search_terms to filter users by their profile data
+        'search_terms'        => $search_terms_default,
 
         'meta_key'            => false,    // Only return users with this usermeta
@@ -1335 +1343 @@
 function bp_directory_members_search_form() {
 
-    $default_search_value = bp_get_search_default_text( 'members' );
-    $search_value         = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value;
+    $query_arg = bp_core_get_component_search_query_arg( 'members' );
+
+    if ( ! empty( $_REQUEST[ $query_arg ] ) ) {
+        $search_value = stripslashes( $_REQUEST[ $query_arg ] );
+    } else {
+        $search_value = bp_get_search_default_text( 'members' );
+    }
 
     $search_form_html = '<form action="" method="get" id="search-members-form">
-        <label><input type="text" name="s" id="members_search" placeholder="'. esc_attr( $search_value ) .'" /></label>
+        <label><input type="text" name="' . esc_attr( $query_arg ) . '" id="members_search" placeholder="'. esc_attr( $search_value ) .'" /></label>
         <input type="submit" id="members_search_submit" name="members_search_submit" value="' . __( 'Search', 'buddypress' ) . '" />
     </form>';