Changeset 8087 for trunk/bp-core/bp-core-classes.php

Timestamp:

03/09/2014 01:58:11 PM (11 years ago)

Author:

boonebgorges

Message:

BP_User_Query search_terms should match against user_login and user_nicename in addition to xprofile fields

This changeset changes the search_terms logic in BP_User_Query so that it
matches user_login and user_nicename in the core users table. Then, via filter,
the xprofile component amends the WHERE clause so that search_terms are matched
in the users table OR the xprofile data table.

Clauses have been refactored to subqueries rather than storing the matched
user IDs in PHP, for improved performance.

See #5155

File:

• trunk/bp-core/bp-core-classes.php (modified) (2 diffs)

trunk/bp-core/bp-core-classes.php

@@ -362 +362 @@
         /** Search Terms ******************************************************/
 
-        // 'search_terms' searches the xprofile fields
-        // To avoid global joins, do a separate query
-        // @todo remove need for bp_is_active() check
-        if ( false !== $search_terms && bp_is_active( 'xprofile' ) ) {
+        // 'search_terms' searches user_login and user_nicename
+        // xprofile field matches happen in bp_xprofile_bp_user_query_search()
+        if ( false !== $search_terms ) {
             $search_terms_clean = esc_sql( esc_sql( $search_terms ) );
-            $search_terms_clean = like_escape( $search_terms_clean );
-            $found_user_ids_query = "SELECT user_id FROM {$bp->profile->table_name_data} WHERE value LIKE '%" . $search_terms_clean . "%'";
-            $found_user_ids = $wpdb->get_col( $found_user_ids_query );
-
-            if ( ! empty( $found_user_ids ) ) {
-                $sql['where'][] = "u.{$this->uid_name} IN (" . implode( ',', wp_parse_id_list( $found_user_ids ) ) . ")";
-            } else {
-                $sql['where'][] = $this->no_results['where'];
-            }
+            $sql['where']['search'] = "u.{$this->uid_name} IN ( SELECT ID FROM {$wpdb->users} WHERE ( user_login LIKE '%{$search_terms_clean}%' OR user_nicename LIKE '%{$search_terms_clean}%' ) )";
         }
 
@@ -400 +391 @@
             $sql['limit'] = '';
         }
+
+        // Allow custom filters
+        $sql = apply_filters_ref_array( 'bp_user_query_uid_clauses', array( $sql, &$this ) );
 
         // Assemble the query chunks