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

Timestamp:

01/19/2010 02:06:25 PM (16 years ago)

Author:

apeatling

Message:

Fixes #1582 - missing activity favorites RSS feed.

File:

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

trunk/bp-activity/bp-activity-classes.php

@@ -218 +218 @@
             $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
 
-        if ( $max )
-            $max_sql = $wpdb->prepare( "LIMIT %d", $max );
-
         /* Searching */
         if ( $search_terms ) {
@@ -249 +246 @@
             $activities = $wpdb->get_results( $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}" ) );
         else
-            $activities = $wpdb->get_results( $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql} {$max_sql}" ) );
-
-        $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(a.id) {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$max_sql}" ) );
+            $activities = $wpdb->get_results( $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}" ) );
+
+        $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(a.id) {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort}" ) );
 
         if ( $activities && $display_comments )
             $activities = BP_Activity_Activity::append_comments( &$activities );
 
+        /* If $max is set, only return up to the max results */
+        if ( (int)$total_activities > (int)$max )
+            $total_activities = $max;
+
         return array( 'activities' => $activities, 'total' => (int)$total_activities );
     }
@@ -270 +271 @@
             $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
 
-        if ( $max )
-            $max_sql = $wpdb->prepare( "LIMIT %d", $max );
-
         if ( $sort != 'ASC' && $sort != 'DESC' )
             $sort = 'DESC';
 
-        $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids}) ORDER BY date_recorded {$sort} $pag_sql $max_sql" ) );
+        $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids}) ORDER BY date_recorded {$sort} $pag_sql" ) );
         $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids})" ) );
 
         if ( $display_comments )
             $activities = BP_Activity_Activity::append_comments( $activities );
+
+        /* If $max is set, only return up to the max results */
+        if ( !empty( $max ) ) {
+            if ( (int)$total_activities > (int)$max )
+                $total_activities = $max;
+        }
 
         return array( 'activities' => $activities, 'total' => (int)$total_activities );