@@ -220,7 +220,7 @@ function bp_activity_admin_load() {
'title'=>__('Item, Link, Type','buddypress'),
'content'=>
'<p>'.__('<strong>Primary Item/Secondary Item</strong> - These identify the object that created the activity. For example, the fields could reference a comment left on a specific site. Some types of activity may only use one, or none, of these fields.','buddypress').'</p>'.
'<p>'.__('<strong>Link</strong> - Activity generated by posts and comments, forum topics and replies, and some plugins, uses the link field for a permalink back to the content item. Some types of activity may not use this field, even if it has been set.','buddypress').'</p>'.
'<p>'.__('<strong>Link</strong> - Used by some types of activity (e.g blog posts and comments, and forum topics and replies) to store a link back to the original content.','buddypress').'</p>'.
'<p>'.__('<strong>Type</strong> - Each distinct kind of activity has its own type. For example, <code>created_group</code> is used when a group is created and <code>joined_group</code> is used when a user joins a group.','buddypress').'</p>'.
'<p>'.__('For information about when and how BuddyPress uses all of these settings, see the Managing Activity link in the panel to the side.','buddypress').'</p>'
));
...
...
@@ -284,6 +284,12 @@ function bp_activity_admin_load() {
$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);
// If $max is set, only return up to the max results
if(!empty($max)){
if((int)$total_activities>(int)$max)
$total_activities=$max;
if(!empty($r['count_total'])){
$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);
