Skip to:
Content

BuddyPress.org

Ticket #3221: bp.3221.diff

File bp.3221.diff, 13.7 KB (added by nacin, 14 years ago)
  • bp-core/bp-core-classes.php

     
    134134                                $sql['select_meta'] .= ", umm.meta_value";
    135135                }
    136136
    137                 $sql['from'] = "FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN " . CUSTOM_USER_META_TABLE . " um ON um.user_id = u.ID";
     137                $sql['from'] = "FROM $wpdb->users u LEFT JOIN $wpdb->usermeta um ON um.user_id = u.ID";
    138138
    139139                if ( $search_terms && bp_is_active( 'xprofile' ) || 'alphabetical' == $type )
    140140                        $sql['join_profiledata'] = "LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id";
     
    284284
    285285                $exclude_sql = ( !empty( $exclude ) ) ? " AND u.ID NOT IN ({$exclude})" : "";
    286286
    287                 $total_users_sql = apply_filters( 'bp_core_users_by_letter_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT u.ID) FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE {$status_sql} AND pf.name = %s {$exclude_sql} AND pd.value LIKE '$letter%%'  ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter );
    288                 $paged_users_sql = apply_filters( 'bp_core_users_by_letter_sql', $wpdb->prepare( "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.user_email FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE {$status_sql} AND pf.name = %s {$exclude_sql} AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC{$pag_sql}", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter, $pag_sql );
     287                $total_users_sql = apply_filters( 'bp_core_users_by_letter_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT u.ID) FROM $wpdb->users u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE {$status_sql} AND pf.name = %s {$exclude_sql} AND pd.value LIKE '$letter%%'  ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter );
     288                $paged_users_sql = apply_filters( 'bp_core_users_by_letter_sql', $wpdb->prepare( "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.user_email FROM $wpdb->users u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE {$status_sql} AND pf.name = %s {$exclude_sql} AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC{$pag_sql}", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter, $pag_sql );
    289289
    290290                $total_users = $wpdb->get_var( $total_users_sql );
    291291                $paged_users = $wpdb->get_results( $paged_users_sql );
     
    317317                $user_sql   = " AND user_id IN ( " . $wpdb->escape( $user_ids ) . " ) ";
    318318                $status_sql = bp_core_get_status_sql();
    319319
    320                 $total_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT ID) FROM " . CUSTOM_USER_TABLE . " WHERE {$status_sql} AND ID IN ( " . $wpdb->escape( $user_ids ) . " ) " ), $wpdb->escape( $user_ids ) );
    321                 $paged_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', $wpdb->prepare( "SELECT DISTINCT ID as id, user_registered, user_nicename, user_login, user_email FROM " . CUSTOM_USER_TABLE . " WHERE {$status_sql} AND ID IN ( " . $wpdb->escape( $user_ids ) . " ) {$pag_sql}" ), $wpdb->escape( $user_ids ) );
     320                $total_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT ID) FROM $wpdb->users WHERE {$status_sql} AND ID IN ( " . $wpdb->escape( $user_ids ) . " ) " ), $wpdb->escape( $user_ids ) );
     321                $paged_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', $wpdb->prepare( "SELECT DISTINCT ID as id, user_registered, user_nicename, user_login, user_email FROM $wpdb->users WHERE {$status_sql} AND ID IN ( " . $wpdb->escape( $user_ids ) . " ) {$pag_sql}" ), $wpdb->escape( $user_ids ) );
    322322
    323323                $total_users = $wpdb->get_var( $total_users_sql );
    324324                $paged_users = $wpdb->get_results( $paged_users_sql );
     
    344344                $search_terms = like_escape( $wpdb->escape( $search_terms ) );
    345345                $status_sql   = bp_core_get_status_sql( 'u.' );
    346346
    347                 $total_users_sql = apply_filters( 'bp_core_search_users_count_sql', "SELECT COUNT(DISTINCT u.ID) as id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE {$status_sql} AND pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC", $search_terms );
    348                 $paged_users_sql = apply_filters( 'bp_core_search_users_sql', "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.user_email FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE {$status_sql} AND pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC{$pag_sql}", $search_terms, $pag_sql );
     347                $total_users_sql = apply_filters( 'bp_core_search_users_count_sql', "SELECT COUNT(DISTINCT u.ID) as id FROM $wpdb->users u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE {$status_sql} AND pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC", $search_terms );
     348                $paged_users_sql = apply_filters( 'bp_core_search_users_sql', "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.user_email FROM $wpdb->users u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE {$status_sql} AND pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC{$pag_sql}", $search_terms, $pag_sql );
    349349
    350350                $total_users = $wpdb->get_var( $total_users_sql );
    351351                $paged_users = $wpdb->get_results( $paged_users_sql );
     
    389389
    390390                // Fetch the user's total friend count
    391391                if ( 'popular' != $type ) {
    392                         $friend_count = $wpdb->get_results( "SELECT user_id as id, meta_value as total_friend_count FROM " . CUSTOM_USER_META_TABLE . " WHERE meta_key = 'total_friend_count' AND user_id IN ( {$user_ids} )" );
     392                        $friend_count = $wpdb->get_results( "SELECT user_id as id, meta_value as total_friend_count FROM $wpdb->usermeta WHERE meta_key = 'total_friend_count' AND user_id IN ( {$user_ids} )" );
    393393                        for ( $i = 0; $i < count( $paged_users ); $i++ ) {
    394394                                foreach ( (array)$friend_count as $count ) {
    395395                                        if ( $count->id == $paged_users[$i]->id )
     
    410410                }
    411411
    412412                if ( 'active' != $type ) {
    413                         $user_activity = $wpdb->get_results( "SELECT user_id as id, meta_value as last_activity FROM " . CUSTOM_USER_META_TABLE . " WHERE meta_key = '" . bp_get_user_meta_key( 'last_activity' ) . "' AND user_id IN ( {$user_ids} )" );
     413                        $user_activity = $wpdb->get_results( "SELECT user_id as id, meta_value as last_activity FROM $wpdb->usermeta WHERE meta_key = '" . bp_get_user_meta_key( 'last_activity' ) . "' AND user_id IN ( {$user_ids} )" );
    414414                        for ( $i = 0; $i < count( $paged_users ); $i++ ) {
    415415                                foreach ( (array)$user_activity as $activity ) {
    416416                                        if ( $activity->id == $paged_users[$i]->id )
     
    421421
    422422                // Fetch the user's last_activity
    423423                if ( 'active' != $type ) {
    424                         $user_activity = $wpdb->get_results( "SELECT user_id as id, meta_value as last_activity FROM " . CUSTOM_USER_META_TABLE . " WHERE meta_key = '" . bp_get_user_meta_key( 'last_activity' ) . "' AND user_id IN ( {$user_ids} )" );
     424                        $user_activity = $wpdb->get_results( "SELECT user_id as id, meta_value as last_activity FROM $wpdb->usermeta WHERE meta_key = '" . bp_get_user_meta_key( 'last_activity' ) . "' AND user_id IN ( {$user_ids} )" );
    425425                        for ( $i = 0; $i < count( $paged_users ); $i++ ) {
    426426                                foreach ( (array)$user_activity as $activity ) {
    427427                                        if ( $activity->id == $paged_users[$i]->id )
     
    431431                }
    432432
    433433                // Fetch the user's latest update
    434                 $user_update = $wpdb->get_results( "SELECT user_id as id, meta_value as latest_update FROM " . CUSTOM_USER_META_TABLE . " WHERE meta_key = '" . bp_get_user_meta_key( 'bp_latest_update' ) . "' AND user_id IN ( {$user_ids} )" );
     434                $user_update = $wpdb->get_results( "SELECT user_id as id, meta_value as latest_update FROM $wpdb->usermeta WHERE meta_key = '" . bp_get_user_meta_key( 'bp_latest_update' ) . "' AND user_id IN ( {$user_ids} )" );
    435435                for ( $i = 0; $i < count( $paged_users ); $i++ ) {
    436436                        foreach ( (array)$user_update as $update ) {
    437437                                if ( $update->id == $paged_users[$i]->id )
  • bp-friends/bp-friends-classes.php

     
    166166                        $sql = "SELECT DISTINCT user_id FROM {$bp->profile->table_name_data} WHERE user_id IN ($fids) AND value LIKE '$filter%%' {$pag_sql}";
    167167                        $total_sql = "SELECT COUNT(DISTINCT user_id) FROM {$bp->profile->table_name_data} WHERE user_id IN ($fids) AND value LIKE '$filter%%'";
    168168                } else {
    169                         $sql = "SELECT DISTINCT user_id FROM " . CUSTOM_USER_META_TABLE . " WHERE user_id IN ($fids) AND meta_key = 'nickname' AND meta_value LIKE '$filter%%' {$pag_sql}";
    170                         $total_sql = "SELECT COUNT(DISTINCT user_id) FROM " . CUSTOM_USER_META_TABLE . " WHERE user_id IN ($fids) AND meta_key = 'nickname' AND meta_value LIKE '$filter%%'";
     169                        $sql = "SELECT DISTINCT user_id FROM $wpdb->usermeta WHERE user_id IN ($fids) AND meta_key = 'nickname' AND meta_value LIKE '$filter%%' {$pag_sql}";
     170                        $total_sql = "SELECT COUNT(DISTINCT user_id) FROM $wpdb->usermeta WHERE user_id IN ($fids) AND meta_key = 'nickname' AND meta_value LIKE '$filter%%'";
    171171                }
    172172
    173173                $filtered_friend_ids = $wpdb->get_col($sql);
     
    201201        function get_bulk_last_active( $user_ids ) {
    202202                global $wpdb, $bp;
    203203
    204                 return $wpdb->get_results( $wpdb->prepare( "SELECT meta_value as last_activity, user_id FROM " . CUSTOM_USER_META_TABLE . " WHERE meta_key = '" . bp_get_user_meta_key( 'last_activity' ) . "' AND user_id IN ( {$user_ids} ) ORDER BY meta_value DESC" ) );
     204                return $wpdb->get_results( $wpdb->prepare( "SELECT meta_value as last_activity, user_id FROM $wpdb->usermeta WHERE meta_key = '" . bp_get_user_meta_key( 'last_activity' ) . "' AND user_id IN ( {$user_ids} ) ORDER BY meta_value DESC" ) );
    205205        }
    206206
    207207        function accept($friendship_id) {
  • bp-members/bp-members-functions.php

     
    153153        if ( empty( $username ) )
    154154                return false;
    155155
    156         return apply_filters( 'bp_core_get_userid', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) ) );
     156        return apply_filters( 'bp_core_get_userid', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->users WHERE user_login = %s", $username ) ) );
    157157}
    158158
    159159/**
     
    171171        if ( empty( $user_nicename ) )
    172172                return false;
    173173
    174         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 ) ) );
     174        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 ) ) );
    175175}
    176176
    177177/**
     
    452452function bp_core_get_userlink_by_username( $username ) {
    453453        global $wpdb;
    454454
    455         $user_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) );
     455        $user_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->users WHERE user_login = %s", $username ) );
    456456        return apply_filters( 'bp_core_get_userlink_by_username', bp_core_get_userlink( $user_id, false, false, true ) );
    457457}
    458458
     
    467467
    468468        if ( !$count = wp_cache_get( 'bp_total_member_count', 'bp' ) ) {
    469469                $status_sql = bp_core_get_status_sql();
    470                 $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM " . CUSTOM_USER_TABLE . " WHERE {$status_sql}" ) );
     470                $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM $wpdb->users WHERE {$status_sql}" ) );
    471471                wp_cache_set( 'bp_total_member_count', $count, 'bp' );
    472472        }
    473473
     
    485485        global $wpdb;
    486486
    487487        if ( is_multisite() )
    488                 $is_spammer = (int) $wpdb->get_var( $wpdb->prepare( "SELECT spam FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) );
     488                $is_spammer = (int) $wpdb->get_var( $wpdb->prepare( "SELECT spam FROM $wpdb->users WHERE ID = %d", $user_id ) );
    489489        else
    490                 $is_spammer = (int) $wpdb->get_var( $wpdb->prepare( "SELECT user_status FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) );
     490                $is_spammer = (int) $wpdb->get_var( $wpdb->prepare( "SELECT user_status FROM $wpdb->users WHERE ID = %d", $user_id ) );
    491491
    492492        return apply_filters( 'bp_core_is_user_spammer', $is_spammer );
    493493}
     
    502502function bp_core_is_user_deleted( $user_id ) {
    503503        global $wpdb;
    504504
    505         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 ) ) );
     505        return apply_filters( 'bp_core_is_user_spammer', (int) $wpdb->get_var( $wpdb->prepare( "SELECT deleted FROM $wpdb->users WHERE ID = %d", $user_id ) ) );
    506506}
    507507
    508508/**
  • bp-loader.php

     
    3636if ( !defined( 'BP_PLUGIN_URL' ) )
    3737        define( 'BP_PLUGIN_URL', plugins_url( $path = '/buddypress' ) );
    3838
    39 // Define the user and usermeta table names, useful if you are using custom or shared tables.
    40 if ( !defined( 'CUSTOM_USER_TABLE' ) )
    41         define( 'CUSTOM_USER_TABLE',      $wpdb->base_prefix . 'users' );
    42 
    43 if ( !defined( 'CUSTOM_USER_META_TABLE' ) )
    44         define( 'CUSTOM_USER_META_TABLE', $wpdb->base_prefix . 'usermeta' );
    45 
    4639// The search slug has to be defined nice and early because of the way search requests are loaded
    4740if ( !defined( 'BP_SEARCH_SLUG' ) )
    4841        define( 'BP_SEARCH_SLUG', 'search' );