Changeset 11595

Timestamp:

06/21/2017 04:55:44 PM (8 years ago)

Author:

dcavins

Message:

Correct search_term parameter in bp_group_has_members().

The function bp_group_has_members() defaults the query parameter
search_terms to null when there are no search terms, but
BP_User_Query expects search_terms to be false rather than null
when a search is not needed.

Props brandonliles.

Fixes #7513.

File:

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

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

@@ -3865 +3865 @@
  *     @type string   $search_terms       Optional. Search terms to match. Pass an
  *                                        empty string to force-disable search, even in
- *                                        the presence of $_REQUEST['s']. Default: null.
+ *                                        the presence of $_REQUEST['s']. Default: false.
  * }
  *
@@ -3879 +3879 @@
     }
 
-    $search_terms_default = null;
+    /*
+     * Use false as the search_terms default so that BP_User_Query
+     * doesn't add a search clause.
+     */
+    $search_terms_default = false;
     $search_query_arg = bp_core_get_component_search_query_arg( 'members' );
     if ( ! empty( $_REQUEST[ $search_query_arg ] ) ) {
@@ -3898 +3902 @@
     ) );
 
-    if ( is_null( $r['search_terms'] ) && ! empty( $_REQUEST['s'] ) ) {
+    /*
+     * If an empty search_terms string has been passed,
+     * the developer is force-disabling search.
+     */
+    if ( '' === $r['search_terms'] ) {
+        // Set the search_terms to false for BP_User_Query efficiency.
+        $r['search_terms'] = false;
+    } elseif ( ! empty( $_REQUEST['s'] ) ) {
         $r['search_terms'] = $_REQUEST['s'];
     }