Changeset 4444 for trunk/bp-members/bp-members-functions.php

Timestamp:

05/29/2011 08:54:18 PM (14 years ago)

Author:

djpaul

Message:

Remove direct usage of CUSTOM_USER_TABLE and CUSTOM_USER_META_TABLE. Fixes #3221, props nacin

File:

• trunk/bp-members/bp-members-functions.php (modified) (5 diffs)

trunk/bp-members/bp-members-functions.php

@@ -157 +157 @@
         return false;
 
-    return apply_filters( 'bp_core_get_userid', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) ) );
+    return apply_filters( 'bp_core_get_userid', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->users WHERE user_login = %s", $username ) ) );
 }
 
@@ -175 +175 @@
         return false;
 
-    return apply_filters( 'bp_core_get_userid_from_nicename', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_nicename = %s", $user_nicename ) ) );
+    return apply_filters( 'bp_core_get_userid_from_nicename', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->users WHERE user_nicename = %s", $user_nicename ) ) );
 }
 
@@ -473 +473 @@
     if ( !$count = wp_cache_get( 'bp_total_member_count', 'bp' ) ) {
         $status_sql = bp_core_get_status_sql();
-        $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM " . CUSTOM_USER_TABLE . " WHERE {$status_sql}" ) );
+        $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM $wpdb->users WHERE {$status_sql}" ) );
         wp_cache_set( 'bp_total_member_count', $count, 'bp' );
     }
@@ -491 +491 @@
 
     if ( is_multisite() )
-        $is_spammer = (int) $wpdb->get_var( $wpdb->prepare( "SELECT spam FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) );
+        $is_spammer = (int) $wpdb->get_var( $wpdb->prepare( "SELECT spam FROM $wpdb->users WHERE ID = %d", $user_id ) );
     else
-        $is_spammer = (int) $wpdb->get_var( $wpdb->prepare( "SELECT user_status FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) );
+        $is_spammer = (int) $wpdb->get_var( $wpdb->prepare( "SELECT user_status FROM $wpdb->users WHERE ID = %d", $user_id ) );
 
     return apply_filters( 'bp_core_is_user_spammer', $is_spammer );
@@ -508 +508 @@
     global $wpdb;
 
-    return apply_filters( 'bp_core_is_user_spammer', (int) $wpdb->get_var( $wpdb->prepare( "SELECT deleted FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) ) );
+    return apply_filters( 'bp_core_is_user_spammer', (int) $wpdb->get_var( $wpdb->prepare( "SELECT deleted FROM $wpdb->users WHERE ID = %d", $user_id ) ) );
 }