Skip to:
Content

BuddyPress.org

Changeset 6557


Ignore:
Timestamp:
12/04/2012 12:03:40 PM (13 years ago)
Author:
djpaul
Message:

Fix alot of WPDB->Prepare() warnings in the 1.6 branch. See #4654

Location:
branches/1.6
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • branches/1.6/bp-activity/bp-activity-classes.php

    r6330 r6557  
    217217
    218218        if ( !empty( $the_index ) ) {
    219             $index_hint_sql = $wpdb->prepare( "USE INDEX ({$the_index})" );
     219            $index_hint_sql = "USE INDEX ({$the_index})";
    220220        } else {
    221221            $index_hint_sql = '';
    … …  
    229229
    230230            $pag_sql    = $wpdb->prepare( "LIMIT %d, %d", absint( ( $page - 1 ) * $per_page ), $per_page );
    231             $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}" ), $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) );
     231            $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}", $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) );
    232232        } else {
    233             $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort}" ), $select_sql, $from_sql, $where_sql, $sort ) );
    234         }
    235 
    236         $total_activities_sql = apply_filters( 'bp_activity_total_activities_sql', $wpdb->prepare( "SELECT count(a.id) FROM {$bp->activity->table_name} a {$index_hint_sql} {$where_sql} ORDER BY a.date_recorded {$sort}" ), $where_sql, $sort );
     233            $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort}", $select_sql, $from_sql, $where_sql, $sort ) );
     234        }
     235
     236        $total_activities_sql = apply_filters( 'bp_activity_total_activities_sql', "SELECT count(a.id) FROM {$bp->activity->table_name} a {$index_hint_sql} {$where_sql} ORDER BY a.date_recorded {$sort}", $where_sql, $sort );
    237237
    238238        $total_activities = $wpdb->get_var( $total_activities_sql );
    … …  
    248248            $activity_user_ids = implode( ',', array_unique( (array) $activity_user_ids ) );
    249249            if ( !empty( $activity_user_ids ) ) {
    250                 if ( $names = $wpdb->get_results( $wpdb->prepare( "SELECT user_id, value AS user_fullname FROM {$bp->profile->table_name_data} WHERE field_id = 1 AND user_id IN ({$activity_user_ids})" ) ) ) {
     250                if ( $names = $wpdb->get_results( "SELECT user_id, value AS user_fullname FROM {$bp->profile->table_name_data} WHERE field_id = 1 AND user_id IN ({$activity_user_ids})" ) ) {
    251251                    foreach ( (array) $names as $name )
    252252                        $tmp_names[$name->user_id] = $name->user_fullname;
    … …  
    402402
    403403        // Fetch the activity IDs so we can delete any comments for this activity item
    404         $activity_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} {$where_sql}" ) );
    405 
    406         if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} {$where_sql}" ) ) )
     404        $activity_ids = $wpdb->get_col( "SELECT id FROM {$bp->activity->table_name} {$where_sql}" );
     405
     406        if ( !$wpdb->query( "DELETE FROM {$bp->activity->table_name} {$where_sql}" ) )
    407407            return false;
    408408
    … …  
    425425            $activity_ids = implode ( ',', array_map( 'absint', explode ( ',', $activity_ids ) ) );
    426426
    427         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE type = 'activity_comment' AND item_id IN ({$activity_ids})" ) );
     427        return $wpdb->query( "DELETE FROM {$bp->activity->table_name} WHERE type = 'activity_comment' AND item_id IN ({$activity_ids})" );
    428428    }
    429429
    … …  
    436436            $activity_ids = implode ( ',', array_map( 'absint', explode ( ',', $activity_ids ) ) );
    437437
    438         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name_meta} WHERE activity_id IN ({$activity_ids})" ) );
     438        return $wpdb->query( "DELETE FROM {$bp->activity->table_name_meta} WHERE activity_id IN ({$activity_ids})" );
    439439    }
    440440
    … …  
    561561        global $wpdb, $bp;
    562562
    563         return $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT component FROM {$bp->activity->table_name} ORDER BY component ASC" ) );
     563        return $wpdb->get_col( "SELECT DISTINCT component FROM {$bp->activity->table_name} ORDER BY component ASC" );
    564564    }
    565565
    … …  
    648648        global $bp, $wpdb;
    649649
    650         return $wpdb->get_var( $wpdb->prepare( "SELECT date_recorded FROM {$bp->activity->table_name} ORDER BY date_recorded DESC LIMIT 1" ) );
     650        return $wpdb->get_var( "SELECT date_recorded FROM {$bp->activity->table_name} ORDER BY date_recorded DESC LIMIT 1" );
    651651    }
    652652

  • branches/1.6/bp-blogs/bp-blogs-classes.php

    r5930 r6557  
    114114            $total_blogs = $wpdb->get_var( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b, {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name_blogmeta} bm, {$bp->blogs->table_name_blogmeta} bm2 WHERE b.blog_id = wb.blog_id AND bm.blog_id = b.blog_id AND bm2.blog_id = b.blog_id AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 {$hidden_sql} AND bm.meta_key = 'name' AND bm2.meta_key = 'description' AND ( bm.meta_value LIKE '%%$filter%%' || bm2.meta_value LIKE '%%$filter%%' ) {$user_sql}" );
    115115        } else {
    116             $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT b.blog_id, b.user_id as admin_user_id, u.user_email as admin_user_email, wb.domain, wb.path, bm.meta_value as last_activity, bm2.meta_value as name FROM {$bp->blogs->table_name} b, {$bp->blogs->table_name_blogmeta} bm, {$bp->blogs->table_name_blogmeta} bm2, {$wpdb->base_prefix}blogs wb, {$wpdb->users} u WHERE b.blog_id = wb.blog_id AND b.user_id = u.ID AND b.blog_id = bm.blog_id AND b.blog_id = bm2.blog_id {$user_sql} AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 {$hidden_sql} AND bm.meta_key = 'last_activity' AND bm2.meta_key = 'name' GROUP BY b.blog_id {$order_sql} {$pag_sql}" ) );
    117             $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b, {$wpdb->base_prefix}blogs wb WHERE b.blog_id = wb.blog_id {$user_sql} AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 {$hidden_sql}" ) );
     116            $paged_blogs = $wpdb->get_results( "SELECT b.blog_id, b.user_id as admin_user_id, u.user_email as admin_user_email, wb.domain, wb.path, bm.meta_value as last_activity, bm2.meta_value as name FROM {$bp->blogs->table_name} b, {$bp->blogs->table_name_blogmeta} bm, {$bp->blogs->table_name_blogmeta} bm2, {$wpdb->base_prefix}blogs wb, {$wpdb->users} u WHERE b.blog_id = wb.blog_id AND b.user_id = u.ID AND b.blog_id = bm.blog_id AND b.blog_id = bm2.blog_id {$user_sql} AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 {$hidden_sql} AND bm.meta_key = 'last_activity' AND bm2.meta_key = 'name' GROUP BY b.blog_id {$order_sql} {$pag_sql}" );
     117            $total_blogs = $wpdb->get_var( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b, {$wpdb->base_prefix}blogs wb WHERE b.blog_id = wb.blog_id {$user_sql} AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 {$hidden_sql}" );
    118118        }
    119119
    … …  
    231231        $pag_sql = ( $limit && $page ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ) : '';
    232232
    233         $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 {$hidden_sql} {$pag_sql}" ) );
    234         $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 {$hidden_sql}" ) );
     233        $paged_blogs = $wpdb->get_results( "SELECT DISTINCT b.blog_id FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 {$hidden_sql} {$pag_sql}" );
     234        $total_blogs = $wpdb->get_var( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 {$hidden_sql}" );
    235235
    236236        return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
    … …  
    248248            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
    249249
    250         $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT bm.blog_id FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE bm.meta_key = 'name' AND bm.meta_value LIKE '$letter%%' {$hidden_sql} AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 ORDER BY bm.meta_value ASC{$pag_sql}" ) );
    251         $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT bm.blog_id) FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE bm.meta_key = 'name' AND bm.meta_value LIKE '$letter%%' {$hidden_sql} AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 ORDER BY bm.meta_value ASC" ) );
     250        $paged_blogs = $wpdb->get_results( "SELECT DISTINCT bm.blog_id FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE bm.meta_key = 'name' AND bm.meta_value LIKE '$letter%%' {$hidden_sql} AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 ORDER BY bm.meta_value ASC{$pag_sql}" );
     251        $total_blogs = $wpdb->get_var( "SELECT COUNT(DISTINCT bm.blog_id) FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE bm.meta_key = 'name' AND bm.meta_value LIKE '$letter%%' {$hidden_sql} AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 ORDER BY bm.meta_value ASC" );
    252252
    253253        return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
    … …  
    266266
    267267        /* Fetch the blog description for each blog (as it may be empty we can't fetch it in the main query). */
    268         $blog_descs = $wpdb->get_results( $wpdb->prepare( "SELECT blog_id, meta_value as description FROM {$bp->blogs->table_name_blogmeta} WHERE meta_key = 'description' AND blog_id IN ( {$blog_ids} )" ) );
     268        $blog_descs = $wpdb->get_results( "SELECT blog_id, meta_value as description FROM {$bp->blogs->table_name_blogmeta} WHERE meta_key = 'description' AND blog_id IN ( {$blog_ids} )" );
    269269
    270270        for ( $i = 0, $count = count( $paged_blogs ); $i < $count; ++$i ) {

  • branches/1.6/bp-blogs/bp-blogs-functions.php

    r6093 r6557  
    5050
    5151    if ( is_multisite() )
    52         $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$wpdb->base_prefix}blogs WHERE mature = 0 AND spam = 0 AND deleted = 0" ) );
     52        $blog_ids = $wpdb->get_col( "SELECT blog_id FROM {$wpdb->base_prefix}blogs WHERE mature = 0 AND spam = 0 AND deleted = 0" );
    5353    else
    5454        $blog_ids = 1;

  • branches/1.6/bp-core/admin/bp-core-functions.php

    r6137 r6557  
    218218     */
    219219    if ( bp_is_active( 'blogs' ) ) {
    220         $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM {$bp->blogs->table_name}" ) );
     220        $count = $wpdb->get_var( "SELECT COUNT(*) FROM {$bp->blogs->table_name}" );
    221221
    222222        if ( empty( $count ) ) {

  • branches/1.6/bp-core/bp-core-cache.php

    r6181 r6557  
    103103    // Get meta info
    104104    $id_list   = join( ',', $object_ids );
    105     $meta_list = $wpdb->get_results( $wpdb->prepare( "SELECT $object_column, meta_key, meta_value FROM $meta_table WHERE $object_column IN ($id_list)" ), ARRAY_A );
     105    $meta_list = $wpdb->get_results( "SELECT $object_column, meta_key, meta_value FROM $meta_table WHERE $object_column IN ($id_list)", ARRAY_A );
    106106
    107107    if ( !empty( $meta_list ) ) {

  • branches/1.6/bp-core/bp-core-classes.php

    r6121 r6557  
    465465        $status_sql = bp_core_get_status_sql();
    466466
    467         $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 ) );
    468         $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 ) );
     467        $total_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', "SELECT COUNT(DISTINCT ID) FROM {$wpdb->users} WHERE {$status_sql} AND ID IN ( " . $wpdb->escape( $user_ids ) . " ) ", $wpdb->escape( $user_ids ) );
     468        $paged_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', "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 ) );
    469469
    470470        $total_users = $wpdb->get_var( $total_users_sql );

  • branches/1.6/bp-core/bp-core-filters.php

    r6034 r6557  
    9696    $user_ids = implode( ',', $user_ids );
    9797
    98     if ( !$userdata = $wpdb->get_results( $wpdb->prepare( "SELECT ID as user_id, user_login, user_nicename FROM {$wpdb->users} WHERE ID IN ({$user_ids})" ) ) )
     98    if ( !$userdata = $wpdb->get_results( "SELECT ID as user_id, user_login, user_nicename FROM {$wpdb->users} WHERE ID IN ({$user_ids})" ) )
    9999        return $comments;
    100100

  • branches/1.6/bp-core/bp-core-functions.php

    r6209 r6557  
    174174        $posts_table_name = bp_is_multiblog_mode() ? $wpdb->posts : $wpdb->get_blog_prefix( bp_get_root_blog_id() ) . 'posts';
    175175        $page_ids_sql     = implode( ',', (array) $page_ids );
    176         $page_names       = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent, post_title FROM {$posts_table_name} WHERE ID IN ({$page_ids_sql}) AND post_status = 'publish' " ) );
     176        $page_names       = $wpdb->get_results( "SELECT ID, post_name, post_parent, post_title FROM {$posts_table_name} WHERE ID IN ({$page_ids_sql}) AND post_status = 'publish' " );
    177177
    178178        foreach ( (array) $page_ids as $component_id => $page_id ) {

  • branches/1.6/bp-core/bp-core-options.php

    r6183 r6557  
    291291    $blog_options_keys      = "'" . join( "', '", (array) $root_blog_option_keys ) . "'";
    292292    $blog_options_table     = bp_is_multiblog_mode() ? $wpdb->options : $wpdb->get_blog_prefix( bp_get_root_blog_id() ) . 'options';
    293     $blog_options_query     = $wpdb->prepare( "SELECT option_name AS name, option_value AS value FROM {$blog_options_table} WHERE option_name IN ( {$blog_options_keys} )" );
     293    $blog_options_query     = "SELECT option_name AS name, option_value AS value FROM {$blog_options_table} WHERE option_name IN ( {$blog_options_keys} )";
    294294    $root_blog_options_meta = $wpdb->get_results( $blog_options_query );
    295295

  • branches/1.6/bp-forums/bp-forums-filters.php

    r5927 r6557  
    158158    global $wpdb;
    159159
    160     $sql = $wpdb->prepare( "DISTINCT t.topic_id, " );
     160    $sql = "DISTINCT t.topic_id, ";
    161161
    162162    return $sql;
    … …  
    179179    global $bbdb, $wpdb;
    180180
    181     $sql .= $wpdb->prepare( " LEFT JOIN $bbdb->posts p ON p.topic_id = t.topic_id " );
     181    $sql .= " LEFT JOIN $bbdb->posts p ON p.topic_id = t.topic_id ";
    182182
    183183    return $sql;

  • branches/1.6/bp-forums/bp-forums-functions.php

    r6108 r6557  
    471471
    472472    // Fetch the topic's last poster details
    473     $poster_details = $wpdb->get_results( $wpdb->prepare( "SELECT t.topic_id, t.topic_last_poster, u.user_login, u.user_nicename, u.user_email, u.display_name FROM {$wpdb->users} u, {$bbdb->topics} t WHERE u.ID = t.topic_last_poster AND t.topic_id IN ( {$topic_ids} )" ) );
     473    $poster_details = $wpdb->get_results( "SELECT t.topic_id, t.topic_last_poster, u.user_login, u.user_nicename, u.user_email, u.display_name FROM {$wpdb->users} u, {$bbdb->topics} t WHERE u.ID = t.topic_last_poster AND t.topic_id IN ( {$topic_ids} )" );
    474474    for ( $i = 0, $count = count( $topics ); $i < $count; ++$i ) {
    475475        foreach ( (array) $poster_details as $poster ) {
    … …  
    485485    // Fetch fullname for the topic's last poster
    486486    if ( bp_is_active( 'xprofile' ) ) {
    487         $poster_names = $wpdb->get_results( $wpdb->prepare( "SELECT t.topic_id, pd.value FROM {$bp->profile->table_name_data} pd, {$bbdb->topics} t WHERE pd.user_id = t.topic_last_poster AND pd.field_id = 1 AND t.topic_id IN ( {$topic_ids} )" ) );
     487        $poster_names = $wpdb->get_results( "SELECT t.topic_id, pd.value FROM {$bp->profile->table_name_data} pd, {$bbdb->topics} t WHERE pd.user_id = t.topic_last_poster AND pd.field_id = 1 AND t.topic_id IN ( {$topic_ids} )" );
    488488        for ( $i = 0, $count = count( $topics ); $i < $count; ++$i ) {
    489489            foreach ( (array) $poster_names as $name ) {
    … …  
    610610
    611611    // Fetch the poster's user_email, user_nicename and user_login
    612     $poster_details = $wpdb->get_results( $wpdb->prepare( "SELECT u.ID as user_id, u.user_login, u.user_nicename, u.user_email, u.display_name FROM {$wpdb->users} u WHERE u.ID IN ( {$user_ids} )" ) );
     612    $poster_details = $wpdb->get_results( "SELECT u.ID as user_id, u.user_login, u.user_nicename, u.user_email, u.display_name FROM {$wpdb->users} u WHERE u.ID IN ( {$user_ids} )" );
    613613
    614614    for ( $i = 0, $count = count( $posts ); $i < $count; ++$i ) {
    … …  
    625625    // Fetch fullname for each poster.
    626626    if ( bp_is_active( 'xprofile' ) ) {
    627         $poster_names = $wpdb->get_results( $wpdb->prepare( "SELECT pd.user_id, pd.value FROM {$bp->profile->table_name_data} pd WHERE pd.user_id IN ( {$user_ids} )" ) );
     627        $poster_names = $wpdb->get_results( "SELECT pd.user_id, pd.value FROM {$bp->profile->table_name_data} pd WHERE pd.user_id IN ( {$user_ids} )" );
    628628        for ( $i = 0, $count = count( $posts ); $i < $count; ++$i ) {
    629629            foreach ( (array) $poster_names as $name ) {

  • branches/1.6/bp-friends/bp-friends-classes.php

    r6120 r6557  
    8585
    8686        if ( !empty( $friend_requests_only ) ) {
    87             $oc_sql = $wpdb->prepare( "AND is_confirmed = 0" );
     87            $oc_sql = "AND is_confirmed = 0";
    8888            $friend_sql = $wpdb->prepare ( " WHERE friend_user_id = %d", $user_id );
    8989        } else {
    90             $oc_sql = $wpdb->prepare( "AND is_confirmed = 1" );
     90            $oc_sql = "AND is_confirmed = 1";
    9191            $friend_sql = $wpdb->prepare ( " WHERE (initiator_user_id = %d OR friend_user_id = %d)", $user_id, $user_id );
    9292        }
    9393
    94         $friends = $wpdb->get_results( $wpdb->prepare( "SELECT friend_user_id, initiator_user_id FROM {$bp->friends->table_name} $friend_sql $oc_sql ORDER BY date_created DESC" ) );
     94        $friends = $wpdb->get_results( "SELECT friend_user_id, initiator_user_id FROM {$bp->friends->table_name} $friend_sql $oc_sql ORDER BY date_created DESC" );
    9595        $fids = array();
    9696
    … …  
    233233        // filter the user_ids based on the search criteria.
    234234        if ( bp_is_active( 'xprofile' ) ) {
    235             $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" );
    236         } else {
    237             $sql = $wpdb->prepare( "SELECT DISTINCT user_id as id FROM $usermeta_table WHERE meta_value LIKE '$filter%%' ORDER BY d.value DESC $pag_sql" );
     235            $sql = "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";
     236        } else {
     237            $sql = "SELECT DISTINCT user_id as id FROM $usermeta_table WHERE meta_value LIKE '$filter%%' ORDER BY d.value DESC $pag_sql";
    238238        }
    239239
    … …  
    256256        // filter the user_ids based on the search criteria.
    257257        if ( bp_is_active( 'xprofile' ) ) {
    258             $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%%'" );
    259         } else {
    260             $sql = $wpdb->prepare( "SELECT COUNT(DISTINCT user_id) FROM $usermeta_table WHERE meta_value LIKE '$filter%%'" );
     258            $sql = "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%%'";
     259        } else {
     260            $sql = "SELECT COUNT(DISTINCT user_id) FROM $usermeta_table WHERE meta_value LIKE '$filter%%'";
    261261        }
    262262

  • branches/1.6/bp-groups/bp-groups-classes.php

    r6277 r6557  
    177177
    178178        // Modify group count usermeta for members
    179         $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->usermeta} SET meta_value = meta_value - 1 WHERE meta_key = 'total_group_count' AND user_id IN ( {$user_id_str} )" ) );
     179        $wpdb->query( "UPDATE {$wpdb->usermeta} SET meta_value = meta_value - 1 WHERE meta_key = 'total_group_count' AND user_id IN ( {$user_id_str} )" );
    180180
    181181        // Now delete all group member entries
    … …  
    235235        $gids = implode( ',', $gids['groups'] );
    236236
    237         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM {$bp->groups->table_name} WHERE ( name LIKE '{$filter}%%' OR description LIKE '{$filter}%%' ) AND id IN ({$gids}) {$pag_sql}" ) );
    238         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name} WHERE ( name LIKE '{$filter}%%' OR description LIKE '{$filter}%%' ) AND id IN ({$gids})" ) );
     237        $paged_groups = $wpdb->get_results( "SELECT id as group_id FROM {$bp->groups->table_name} WHERE ( name LIKE '{$filter}%%' OR description LIKE '{$filter}%%' ) AND id IN ({$gids}) {$pag_sql}" );
     238        $total_groups = $wpdb->get_var( "SELECT COUNT(id) FROM {$bp->groups->table_name} WHERE ( name LIKE '{$filter}%%' OR description LIKE '{$filter}%%' ) AND id IN ({$gids})" );
    239239
    240240        return array( 'groups' => $paged_groups, 'total' => $total_groups );
    … …  
    533533
    534534        if ( !bp_current_user_can( 'bp_moderate' ) )
    535             $hidden_sql = $wpdb->prepare( " AND status != 'hidden'");
     535            $hidden_sql = " AND status != 'hidden'";
    536536
    537537        $letter = like_escape( $wpdb->escape( $letter ) );
    … …  
    539539        if ( !empty( $limit ) && !empty( $page ) ) {
    540540            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
    541             $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND g.name LIKE '$letter%%' {$hidden_sql} {$search_sql} {$exclude_sql}" ) );
    542         }
    543 
    544         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND g.name LIKE '$letter%%' {$hidden_sql} {$search_sql} {$exclude_sql} ORDER BY g.name ASC {$pag_sql}"  ) );
     541            $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND g.name LIKE '$letter%%' {$hidden_sql} {$search_sql} {$exclude_sql}" );
     542        }
     543
     544        $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND g.name LIKE '$letter%%' {$hidden_sql} {$search_sql} {$exclude_sql} ORDER BY g.name ASC {$pag_sql}" );
    545545
    546546        if ( !empty( $populate_extras ) ) {
    … …  
    637637            $hidden_sql = "WHERE status != 'hidden'";
    638638
    639         return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name} {$hidden_sql}" ) );
     639        return $wpdb->get_var( "SELECT COUNT(id) FROM {$bp->groups->table_name} {$hidden_sql}" );
    640640    }
    641641
    … …  
    692692
    693693            case 'hidden' :
    694                 $status_sql = $wpdb->prepare( "AND g.status = 'hidden'" );
     694                $status_sql = "AND g.status = 'hidden'";
    695695                break;
    696696
    697697            case 'private' :
    698                 $status_sql = $wpdb->prepare( "AND g.status = 'private'" );
     698                $status_sql = "AND g.status = 'private'";
    699699                break;
    700700
    701701            case 'public' :
    702702            default :
    703                 $status_sql = $wpdb->prepare( "AND g.status = 'public'" );
     703                $status_sql = "AND g.status = 'public'";
    704704                break;
    705705        }
    … …  
    11741174        $exclude_admins_sql = '';
    11751175        if ( !empty( $exclude_admins_mods ) )
    1176             $exclude_admins_sql = $wpdb->prepare( "AND is_admin = 0 AND is_mod = 0" );
     1176            $exclude_admins_sql = "AND is_admin = 0 AND is_mod = 0";
    11771177
    11781178        $banned_sql = '';
    11791179        if ( !empty( $exclude_banned ) )
    1180             $banned_sql = $wpdb->prepare( " AND is_banned = 0" );
     1180            $banned_sql = " AND is_banned = 0";
    11811181
    11821182        $exclude_sql = '';
    11831183        if ( !empty( $exclude ) )
    1184             $exclude_sql = $wpdb->prepare( " AND m.user_id NOT IN ({$exclude})" );
     1184            $exclude_sql = " AND m.user_id NOT IN ({$exclude})";
    11851185
    11861186        if ( bp_is_active( 'xprofile' ) )

  • branches/1.6/bp-members/bp-members-functions.php

    r6320 r6557  
    479479    if ( !$count = wp_cache_get( 'bp_total_member_count', 'bp' ) ) {
    480480        $status_sql = bp_core_get_status_sql();
    481         $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM $wpdb->users WHERE {$status_sql}" ) );
     481        $count = $wpdb->get_var( "SELECT COUNT(ID) FROM $wpdb->users WHERE {$status_sql}" );
    482482        wp_cache_set( 'bp_total_member_count', $count, 'bp' );
    483483    }
    … …  
    497497        // Avoid a costly join by splitting the lookup
    498498        if ( is_multisite() ) {
    499             $sql = $wpdb->prepare( "SELECT ID FROM $wpdb->users WHERE (user_status != 0 OR deleted != 0 OR user_status != 0)" );
     499            $sql = "SELECT ID FROM $wpdb->users WHERE (user_status != 0 OR deleted != 0 OR user_status != 0)";
    500500        } else {
    501             $sql = $wpdb->prepare( "SELECT ID FROM $wpdb->users WHERE user_status != 0" );
     501            $sql = "SELECT ID FROM $wpdb->users WHERE user_status != 0";
    502502        }
    503503
    504504        $exclude_users = $wpdb->get_col( $sql );
    505         $exclude_users_sql = !empty( $exclude_users ) ? $wpdb->prepare( "AND user_id NOT IN (" . implode( ',', wp_parse_id_list( $exclude_users ) ) . ")" ) : '';
     505        $exclude_users_sql = !empty( $exclude_users ) ? "AND user_id NOT IN (" . implode( ',', wp_parse_id_list( $exclude_users ) ) . ")" : '';
    506506
    507507        $count = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(user_id) FROM $wpdb->usermeta WHERE meta_key = %s {$exclude_users_sql}", bp_get_user_meta_key( 'last_activity' ) ) );

  • branches/1.6/bp-messages/bp-messages-classes.php

    r6057 r6557  
    145145
    146146        if ( $type == 'unread' )
    147             $type_sql = $wpdb->prepare( " AND r.unread_count != 0 " );
     147            $type_sql = " AND r.unread_count != 0 ";
    148148        elseif ( $type == 'read' )
    149             $type_sql = $wpdb->prepare( " AND r.unread_count = 0 " );
     149            $type_sql = " AND r.unread_count = 0 ";
    150150
    151151        if ( !empty( $search_terms ) ) {
    … …  
    200200
    201201        if ( $type == 'unread' )
    202             $type_sql = $wpdb->prepare( " AND unread_count != 0 " );
     202            $type_sql = " AND unread_count != 0 ";
    203203        else if ( $type == 'read' )
    204             $type_sql = $wpdb->prepare( " AND unread_count = 0 " );
     204            $type_sql = " AND unread_count = 0 ";
    205205
    206206        return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(thread_id) FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0$exclude_sender $type_sql", $user_id ) );
    … …  
    283283        $bp_prefix = bp_core_get_table_prefix();
    284284        $errors    = false;
    285         $threads   = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp_prefix}bp_messages_threads" ) );
     285        $threads   = $wpdb->get_results( "SELECT * FROM {$bp_prefix}bp_messages_threads" );
    286286
    287287        // Nothing to update, just return true to remove the table
    … …  
    358358        // If we have no thread_id then this is the first message of a new thread.
    359359        if ( empty( $this->thread_id ) ) {
    360             $this->thread_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT MAX(thread_id) FROM {$bp->messages->table_name_messages}" ) ) + 1;
     360            $this->thread_id = (int) $wpdb->get_var( "SELECT MAX(thread_id) FROM {$bp->messages->table_name_messages}" ) + 1;
    361361            $new_thread = true;
    362362        }
    … …  
    539539        }
    540540
    541         $notices = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_notices} ORDER BY date_sent DESC {$limit_sql}" ) );
     541        $notices = $wpdb->get_results( "SELECT * FROM {$bp->messages->table_name_notices} ORDER BY date_sent DESC {$limit_sql}" );
    542542
    543543        return $notices;
    … …  
    547547        global $wpdb, $bp;
    548548
    549         $notice_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM " . $bp->messages->table_name_notices ) );
     549        $notice_count = $wpdb->get_var( "SELECT COUNT(id) FROM " . $bp->messages->table_name_notices );
    550550
    551551        return $notice_count;
    … …  
    555555        global $wpdb, $bp;
    556556
    557         $notice_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_notices} WHERE is_active = 1" ) );
     557        $notice_id = $wpdb->get_var( "SELECT id FROM {$bp->messages->table_name_notices} WHERE is_active = 1" );
    558558        return new BP_Messages_Notice( $notice_id );
    559559    }

  • branches/1.6/bp-xprofile/bp-xprofile-classes.php

    r6223 r6557  
    134134            $where_sql = $wpdb->prepare( 'WHERE g.id = %d', $profile_group_id );
    135135        elseif ( $exclude_groups )
    136             $where_sql = $wpdb->prepare( "WHERE g.id NOT IN ({$exclude_groups})");
     136            $where_sql = "WHERE g.id NOT IN ({$exclude_groups})";
    137137
    138138        if ( !empty( $hide_empty_groups ) )
    139             $groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g INNER JOIN {$bp->profile->table_name_fields} f ON g.id = f.group_id {$where_sql} ORDER BY g.group_order ASC" ) );
     139            $groups = $wpdb->get_results( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g INNER JOIN {$bp->profile->table_name_fields} f ON g.id = f.group_id {$where_sql} ORDER BY g.group_order ASC" );
    140140        else
    141             $groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g {$where_sql} ORDER BY g.group_order ASC" ) );
     141            $groups = $wpdb->get_results( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g {$where_sql} ORDER BY g.group_order ASC" );
    142142
    143143        if ( empty( $fetch_fields ) )
    … …  
    165165
    166166        if ( !empty( $exclude_fields_cs ) ) {
    167             $exclude_fields_sql = $wpdb->prepare( "AND id NOT IN ({$exclude_fields_cs})" );
     167            $exclude_fields_sql = "AND id NOT IN ({$exclude_fields_cs})";
    168168        } else {
    169169            $exclude_fields_sql = '';
    … …  
    171171
    172172        // Fetch the fields
    173         $fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, name, description, type, group_id, is_required FROM {$bp->profile->table_name_fields} WHERE group_id IN ( {$group_ids} ) AND parent_id = 0 {$exclude_fields_sql} ORDER BY field_order" ) );
     173        $fields = $wpdb->get_results( "SELECT id, name, description, type, group_id, is_required FROM {$bp->profile->table_name_fields} WHERE group_id IN ( {$group_ids} ) AND parent_id = 0 {$exclude_fields_sql} ORDER BY field_order" );
    174174
    175175        if ( empty( $fields ) )
    … …  
    332332        global $wpdb, $bp;
    333333
    334         $levels = $wpdb->get_results( $wpdb->prepare( "SELECT object_id, meta_key, meta_value FROM {$bp->profile->table_name_meta} WHERE object_type = 'field' AND ( meta_key = 'default_visibility' OR meta_key = 'allow_custom_visibility' )" ) );
     334        $levels = $wpdb->get_results( "SELECT object_id, meta_key, meta_value FROM {$bp->profile->table_name_meta} WHERE object_type = 'field' AND ( meta_key = 'default_visibility' OR meta_key = 'allow_custom_visibility' )" );
    335335
    336336        // Arrange so that the field id is the key and the visibility level the value
    … …  
    11981198
    11991199        if ( !empty( $exclude_fullname ) )
    1200             $exclude_sql = $wpdb->prepare( " AND pf.id != 1" );
     1200            $exclude_sql = " AND pf.id != 1";
    12011201
    12021202        return $wpdb->get_results( $wpdb->prepare( "SELECT pf.type, pf.name, pd.value FROM {$bp->profile->table_name_data} pd INNER JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id AND pd.user_id = %d {$exclude_sql} ORDER BY RAND() LIMIT 1", $user_id ) );
Note: See TracChangeset for help on using the changeset viewer.