Ticket #7513: 7513.2.diff

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

@@ -3864 +3864 @@
  *                                        {@link BP_User_Query}. Default: 'last_joined'.
  *     @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.
  * }
  *
  * @return bool
@@ -3878 +3878 @@
                 $exclude_admins_mods = 0;
         }
 
-        $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 ] ) ) {
                 $search_terms_default = stripslashes( $_REQUEST[ $search_query_arg ] );
@@ -3897 +3901 @@
                 'type'                => 'last_joined',
         ) );
 
-        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'];
         }