Changeset 8116

Timestamp:

03/12/2014 06:46:44 PM (11 years ago)

Author:

boonebgorges

Message:

Auto-fetch URL search parameters in bp_has_groups() before parsing $args array

Our previous method, of getting the search term out of $_REQUEST, had the
effect of overriding any search terms that were passed to the bp_has_groups()
function. Among other problems, this made it impossible to get an unfiltered
group list when looking at a page that was using an 's' parameter for something
else.

Fixes #5456

File:

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

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

@@ -312 +312 @@
     }
 
+    // Default search string
+    if ( ! empty( $_REQUEST['group-filter-box'] ) ) {
+        $search_terms = $_REQUEST['group-filter-box'];
+    } elseif ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) ) {
+        $search_terms = $_REQUEST['s'];
+    } else {
+        $search_terms = false;
+    }
+
     $defaults = array(
         'type'              => $type, // 'type' is an override for 'order' and 'orderby'. See docblock.
@@ -325 +334 @@
         'user_id'           => $user_id, // Pass a user ID to limit to groups this user has joined
         'slug'              => $slug,    // Pass a group slug to only return that group
-        'search_terms'      => '',       // Pass search terms to return only matching groups
+        'search_terms'      => $search_terms, // Pass search terms to return only matching groups
         'meta_query'        => false,    // Filter by groupmeta. See WP_Meta_Query for format
         'include'           => false,    // Pass comma separated list or array of group ID's to return only these groups
@@ -335 +344 @@
 
     $r = wp_parse_args( $args, $defaults );
-
-    if ( empty( $r['search_terms'] ) ) {
-        if ( isset( $_REQUEST['group-filter-box'] ) && !empty( $_REQUEST['group-filter-box'] ) )
-            $r['search_terms'] = $_REQUEST['group-filter-box'];
-        elseif ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) )
-            $r['search_terms'] = $_REQUEST['s'];
-        else
-            $r['search_terms'] = false;
-    }
 
     $groups_template = new BP_Groups_Template( array(