Changeset 6557 for branches/1.6/bp-activity/bp-activity-classes.php

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

File:

• branches/1.6/bp-activity/bp-activity-classes.php (modified) (8 diffs)

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

@@ -217 +217 @@
 
         if ( !empty( $the_index ) ) {
-            $index_hint_sql = $wpdb->prepare( "USE INDEX ({$the_index})" ); 
+            $index_hint_sql = "USE INDEX ({$the_index})";
         } else {
             $index_hint_sql = '';
@@ -229 +229 @@
 
             $pag_sql    = $wpdb->prepare( "LIMIT %d, %d", absint( ( $page - 1 ) * $per_page ), $per_page );
-            $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 ) );
+            $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 ) );
         } else {
-            $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 ) );
-        }
-
-        $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 );
+            $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 ) );
+        }
+
+        $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 );
 
         $total_activities = $wpdb->get_var( $total_activities_sql );
@@ -248 +248 @@
             $activity_user_ids = implode( ',', array_unique( (array) $activity_user_ids ) );
             if ( !empty( $activity_user_ids ) ) {
-                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})" ) ) ) {
+                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})" ) ) {
                     foreach ( (array) $names as $name )
                         $tmp_names[$name->user_id] = $name->user_fullname;
@@ -402 +402 @@
 
         // Fetch the activity IDs so we can delete any comments for this activity item
-        $activity_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} {$where_sql}" ) );
-
-        if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} {$where_sql}" ) ) )
+        $activity_ids = $wpdb->get_col( "SELECT id FROM {$bp->activity->table_name} {$where_sql}" );
+
+        if ( !$wpdb->query( "DELETE FROM {$bp->activity->table_name} {$where_sql}" ) )
             return false;
 
@@ -425 +425 @@
             $activity_ids = implode ( ',', array_map( 'absint', explode ( ',', $activity_ids ) ) );
 
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE type = 'activity_comment' AND item_id IN ({$activity_ids})" ) );
+        return $wpdb->query( "DELETE FROM {$bp->activity->table_name} WHERE type = 'activity_comment' AND item_id IN ({$activity_ids})" );
     }
 
@@ -436 +436 @@
             $activity_ids = implode ( ',', array_map( 'absint', explode ( ',', $activity_ids ) ) );
 
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name_meta} WHERE activity_id IN ({$activity_ids})" ) );
+        return $wpdb->query( "DELETE FROM {$bp->activity->table_name_meta} WHERE activity_id IN ({$activity_ids})" );
     }
 
@@ -561 +561 @@
         global $wpdb, $bp;
 
-        return $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT component FROM {$bp->activity->table_name} ORDER BY component ASC" ) );
+        return $wpdb->get_col( "SELECT DISTINCT component FROM {$bp->activity->table_name} ORDER BY component ASC" );
     }
 
@@ -648 +648 @@
         global $bp, $wpdb;
 
-        return $wpdb->get_var( $wpdb->prepare( "SELECT date_recorded FROM {$bp->activity->table_name} ORDER BY date_recorded DESC LIMIT 1" ) );
+        return $wpdb->get_var( "SELECT date_recorded FROM {$bp->activity->table_name} ORDER BY date_recorded DESC LIMIT 1" );
     }