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

Timestamp:

04/13/2010 04:01:07 PM (14 years ago)

Author:

apeatling

Message:

Replacing function_exists() checks with bp_is_active() checks.

File:

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

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

@@ -56 +56 @@
      */
     function populate() {
-        if ( function_exists( 'xprofile_install' ) )
+        if ( bp_is_active( 'xprofile' ) )
             $this->profile_data = $this->get_profile_data();
 
@@ -86 +86 @@
         global $bp;
 
-        if ( function_exists('friends_install') )
+        if ( bp_is_active( 'friends' ) )
             $this->total_friends = BP_Friends_Friendship::total_friend_count( $this->id );
 
-        if ( function_exists('groups_install') ) {
+        if ( bp_is_active( 'groups' ) ) {
             $this->total_groups = BP_Groups_Member::total_group_count( $this->id );
 
@@ -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";
 
@@ -142 +142 @@
             $sql['where_alpha'] = "AND pd.field_id = 1";
 
-        if ( $user_id && function_exists( 'friends_install' ) ) {
+        if ( $user_id && bp_is_active( 'friends' ) ) {
             $friend_ids = friends_get_friend_user_ids( $user_id );
             $friend_ids = $wpdb->escape( implode( ',', (array)$friend_ids ) );
@@ -154 +154 @@
         }
 
-        if ( $search_terms && function_exists( 'xprofile_install' ) ) {
+        if ( $search_terms && bp_is_active( 'xprofile' ) ) {
             $search_terms = like_escape( $wpdb->escape( $search_terms ) );
             $sql['where_searchterms'] = "AND pd.value LIKE '%%$search_terms%%'";
@@ -320 +320 @@
 
         /* Fetch the user's full name */
-        if ( function_exists( 'xprofile_install' ) && 'alphabetical' != $type ) {
+        if ( bp_is_active( 'xprofile' ) && 'alphabetical' != $type ) {
             $names = $wpdb->get_results( $wpdb->prepare( "SELECT pd.user_id as id, pd.value as fullname FROM {$bp->profile->table_name_fields} pf, {$bp->profile->table_name_data} pd WHERE pf.id = pd.field_id AND pf.name = %s AND pd.user_id IN ( {$user_ids} )", BP_XPROFILE_FULLNAME_FIELD_NAME ) );
             for ( $i = 0; $i < count( $paged_users ); $i++ ) {
@@ -342 +342 @@
 
         /* Fetch whether or not the user is a friend */
-        if ( function_exists( 'friends_install' ) ) {
+        if ( bp_is_active( 'friends' ) ) {
             $friend_status = $wpdb->get_results( $wpdb->prepare( "SELECT initiator_user_id, friend_user_id, is_confirmed FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d AND friend_user_id IN ( {$user_ids} ) ) OR (initiator_user_id IN ( {$user_ids} ) AND friend_user_id = %d )", $bp->loggedin_user->id, $bp->loggedin_user->id ) );
             for ( $i = 0; $i < count( $paged_users ); $i++ ) {
@@ -381 +381 @@
             }
         }
+
+        var_dump( $paged_users );
 
         return $paged_users;