Changeset 6498 for trunk/bp-activity/bp-activity-classes.php

Timestamp:

11/09/2012 01:57:34 PM (12 years ago)

Author:

djpaul

Message:

Remove more unneeded prepare() calls in bp-activity-classes.php. See #4654

File:

• trunk/bp-activity/bp-activity-classes.php (modified) (3 diffs)

trunk/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;