Changeset 3790 for trunk/bp-friends/bp-friends-classes.php

Timestamp:

01/21/2011 11:03:05 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Rename internal references to 'xprofile' component to 'profile' for object consistency and proper fallback support for when XProfile is disabled and the WP profile steps in. Move more code out of core and into Users and XProfile components. Split bp-xprofile-loader up into smaller files and convert to BP_Component.

File:

• trunk/bp-friends/bp-friends-classes.php (modified) (4 diffs)

trunk/bp-friends/bp-friends-classes.php

@@ -159 +159 @@
 
         // filter the user_ids based on the search criteria.
-        if ( bp_is_active( 'xprofile' ) ) {
+        if ( bp_is_active( 'profile' ) ) {
             $sql = "SELECT DISTINCT user_id FROM {$bp->profile->table_name_data} WHERE user_id IN ($fids) AND value LIKE '$filter%%' {$pag_sql}";
             $total_sql = "SELECT COUNT(DISTINCT user_id) FROM {$bp->profile->table_name_data} WHERE user_id IN ($fids) AND value LIKE '$filter%%'";
@@ -225 +225 @@
 
         // filter the user_ids based on the search criteria.
-        if ( bp_is_active( 'xprofile' ) ) {
+        if ( bp_is_active( 'profile' ) ) {
             $sql = $wpdb->prepare( "SELECT DISTINCT d.user_id as id FROM {$bp->profile->table_name_data} d, $users_table u WHERE d.user_id = u.id AND d.value LIKE '$filter%%' ORDER BY d.value DESC $pag_sql" );
         } else {
@@ -248 +248 @@
 
         // filter the user_ids based on the search criteria.
-        if ( bp_is_active( 'xprofile' ) ) {
+        if ( bp_is_active( 'profile' ) ) {
             $sql = $wpdb->prepare( "SELECT COUNT(DISTINCT d.user_id) FROM {$bp->profile->table_name_data} d, $users_table u WHERE d.user_id = u.id AND d.value LIKE '$filter%%'" );
         } else {
@@ -265 +265 @@
         global $wpdb, $bp;
 
-        if ( !bp_is_active( 'xprofile' ) )
+        if ( !bp_is_active( 'profile' ) )
             return false;