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

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

@@ -412 +412 @@
                                 $search_terms_nospace = '%' . $search_terms . '%';
                                 $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(
+                                " LEFT 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,
                                 $search_terms_space
                         );
+
+                        $sql['where']['search'] = "r.ID IS NOT NULL";
                 }
 
                 // Only use $member_type__in if $member_type is not set.

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

@@ -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(
+                " LEFT 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;
+        $search_combined = " ( p.id IS NOT NULL OR {$search_core} )";
+        $sql['where']['search']  = $search_combined;
 
         return $sql;
 }