Changeset 3373 for trunk/bp-activity/bp-activity-templatetags.php

Timestamp:

11/07/2010 11:33:21 AM (16 years ago)

Author:

boonebgorges

Message:

Adds exclude parameter to bp_has_activities. Fixes #2646

File:

• trunk/bp-activity/bp-activity-templatetags.php (modified) (5 diffs)

trunk/bp-activity/bp-activity-templatetags.php

@@ -16 +16 @@
     var $full_name;
 
-    function bp_activity_template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden ) {
+    function bp_activity_template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude ) {
         global $bp;
 
@@ -33 +33 @@
         // Fetch all activity items
         else
-            $this->activities = bp_activity_get( array( 'display_comments' => $display_comments, 'max' => $max, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'sort' => $sort, 'search_terms' => $search_terms, 'filter' => $filter, 'show_hidden' => $show_hidden ) );
+            $this->activities = bp_activity_get( array( 'display_comments' => $display_comments, 'max' => $max, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'sort' => $sort, 'search_terms' => $search_terms, 'filter' => $filter, 'show_hidden' => $show_hidden, 'exclude' => $exclude ) );
 
         if ( !$max || $max >= (int)$this->activities['total'] )
@@ -143 +143 @@
     $user_id = false;
     $include = false;
+    $exclude = false;
     $show_hidden = false;
     $object = false;
@@ -167 +168 @@
     $defaults = array(
         'display_comments' => 'threaded', // false for none, stream/threaded - show comments in the stream or threaded under items
-        'include' => $include, // pass an activity_id or string of ID's comma separated
+        'include' => $include, // pass an activity_id or string of IDs comma-separated
+        'exclude' => $exclude, // pass an activity_id or string of IDs comma-separated
         'sort' => 'DESC', // sort DESC or ASC
         'page' => 1, // which page to load
@@ -255 +257 @@
         $filter = array( 'user_id' => $user_id, 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id );
 
-    $activities_template = new BP_Activity_Template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden );
+    $activities_template = new BP_Activity_Template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude );
 
     return apply_filters( 'bp_has_activities', $activities_template->has_activities(), &$activities_template );