Ticket #5629: bp-activity-classes.diff
| File bp-activity-classes.diff, 1.6 KB (added by , 13 years ago) |
|---|
-
bp-activity-classes.php
440 440 $activities = self::get_activity_data( $activity_ids ); 441 441 } 442 442 443 $total_activities_sql = apply_filters( 'bp_activity_total_activities_sql', "SELECT count(DISTINCT a.id) FROM {$bp->activity->table_name} a {$join_sql} {$where_sql}", $where_sql, $sort );444 $total_activities = $wpdb->get_var( $total_activities_sql );445 446 443 // Get the fullnames of users so we don't have to query in the loop 447 444 $activities = self::append_user_fullnames( $activities ); 448 445 … … 465 462 // Generate action strings 466 463 $activities = BP_Activity_Activity::generate_action_strings( $activities ); 467 464 468 // If $max is set, only return up to the max results 469 if ( !empty( $max ) ) { 470 if ( (int) $total_activities > (int) $max ) 471 $total_activities = $max; 472 } 465 // If $max is set, only return up to the max results 466 if ( !empty( $max ) ) { 467 $total_activities_sql = apply_filters( 'bp_activity_total_activities_sql', "SELECT count(DISTINCT a.id) FROM {$bp->activity->table_name} a {$join_sql} {$where_sql}", $where_sql, $sort ); 468 $total_activities = $wpdb->get_var( $total_activities_sql ); 469 if ( (int) $total_activities > (int) $max ) 470 $total_activities = $max; 471 } else { 472 $total_activities = 0; 473 } 473 474 474 475 return array( 'activities' => $activities, 'total' => (int) $total_activities ); 475 476 }