Ticket #7442: bp-search-use-joins.patch

src/bp-core/classes/class-bp-user-query.php

@@ -413 +413 @@
                                 $search_terms_space   = '%' . $search_terms . '%';
                         }
 
-                        $sql['where']['search'] = $wpdb->prepare(
-                                "u.{$this->uid_name} IN ( SELECT ID FROM {$wpdb->users} WHERE ( user_login LIKE %s OR user_login LIKE %s OR user_nicename LIKE %s OR user_nicename LIKE %s ) )",
+                        $sql['select'] .= $wpdb->prepare(
+                                " JOIN {$wpdb->users} r ON r.ID = u.{$this->uid_name} AND ( r.user_login LIKE %s OR r.user_login LIKE %s OR r.user_nicename LIKE %s OR r.user_nicename LIKE %s ) )",
                                 $search_terms_nospace,
                                 $search_terms_space,
                                 $search_terms_nospace,

src/bp-xprofile/bp-xprofile-functions.php

@@ -760 +760 @@
 function bp_xprofile_bp_user_query_search( $sql, BP_User_Query $query ) {
         global $wpdb;
 
-        if ( empty( $query->query_vars['search_terms'] ) || empty( $sql['where']['search'] ) ) {
+        if ( empty( $query->query_vars['search_terms'] ) ) {
                 return $sql;
         }
 
@@ -781 +781 @@
 
         // Combine the core search (against wp_users) into a single OR clause
         // with the xprofile_data search.
-        $search_xprofile = $wpdb->prepare(
-                "u.{$query->uid_name} IN ( SELECT user_id FROM {$bp->profile->table_name_data} WHERE value LIKE %s OR value LIKE %s )",
+        $sql['select'] .= $wpdb->prepare(
+                " JOIN {$bp->profile->table_name_data} p ON p.user_id = u.{$query->uid_name} AND ( p.value LIKE %s OR p.value LIKE %s )",
                 $search_terms_nospace,
                 $search_terms_space
         );
 
-        $search_core     = $sql['where']['search'];
-        $search_combined = "( {$search_xprofile} OR {$search_core} )";
-        $sql['where']['search'] = $search_combined;
-
         return $sql;
 }
 add_action( 'bp_user_query_uid_clauses', 'bp_xprofile_bp_user_query_search', 10, 2 );