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

Timestamp:

11/07/2010 11:17:17 AM (15 years ago)

Author:

boonebgorges

Message:

Reapplies changes to BP_Groups_Group::get methods that were accidentally reverted in r3300. Adds exclude parameters to groups get methods. Fixes #2639

File:

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

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

@@ -125 +125 @@
         $sql['from'] = "FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN " . CUSTOM_USER_META_TABLE . " um ON um.user_id = u.ID";
 
-        if ( $search_terms && function_exists( 'xprofile_install' ) || 'alphabetical' == $type )
+        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";
 
@@ -155 +155 @@
         }
 
-        else if ( $user_id && function_exists( 'friends_install' ) ) {
+        else if ( $user_id && bp_is_active( 'friends' ) ) {
             $friend_ids = friends_get_friend_user_ids( $user_id );
             $friend_ids = $wpdb->escape( implode( ',', (array)$friend_ids ) );