Changeset 4891

Timestamp:

07/28/2011 11:04:38 PM (14 years ago)

Author:

boonebgorges

Message:

Joins xprofile data field separately for members directory search and for members directory alphabetical sort, to ensure proper search domain. Fixes #3403. Props lpryor

File:

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

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

@@ -223 +223 @@
         $sql['from'] = "FROM $wpdb->users u LEFT JOIN $wpdb->usermeta um ON um.user_id = u.ID";
 
-        if ( $search_terms && bp_is_active( 'xprofile' ) || 'alphabetical' == $type )
-            $sql['join_profiledata'] = "LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id";
+        // We search against xprofile fields, so we must join the table
+        if ( $search_terms && bp_is_active( 'xprofile' ) )
+            $sql['join_profiledata_search'] = "LEFT JOIN {$bp->profile->table_name_data} spd ON u.ID = spd.user_id";
+
+        // Alphabetical sorting is done by the xprofile Full Name field
+        if ( 'alphabetical' == $type )
+            $sql['join_profiledata_alpha'] = "LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id";
 
         if ( $meta_key )
@@ -271 +276 @@
         if ( $search_terms && bp_is_active( 'xprofile' ) ) {
             $search_terms             = like_escape( $wpdb->escape( $search_terms ) );
-            $sql['where_searchterms'] = "AND pd.value LIKE '%%$search_terms%%'";
+            $sql['where_searchterms'] = "AND spd.value LIKE '%%$search_terms%%'";
         }