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

Timestamp:

11/25/2009 08:38:56 PM (17 years ago)

Author:

apeatling

Message:

Activity stream commenting updates

File:

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

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

@@ -17 +17 @@
         var $full_name;
 
-        function bp_activity_template( $type, $user_id, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments ) {
+        function bp_activity_template( $type, $user_id, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden ) {
                 global $bp;
 
@@ -29 +29 @@
                 } else {
                         if ( $type == 'sitewide' )
-                                $this->activities = bp_activity_get_sitewide( array( 'display_comments' => $display_comments, 'max' => $max, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'sort' => $sort, 'search_terms' => $search_terms, 'filter' => $filter ) );
+                                $this->activities = bp_activity_get_sitewide( 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 ) );
 
                         if ( $type == 'personal' )
@@ -129 +129 @@
                 'per_page' => 25, // number of items per page
                 'max' => false, // max number to return
+                'show_hidden' => false, // Show activity items that are hidden site-wide?
 
                 /* Filtering */
@@ -157 +158 @@
                 $filter = array( 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id );
 
-        $activities_template = new BP_Activity_Template( $type, $user_id, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments );
+        $activities_template = new BP_Activity_Template( $type, $user_id, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden );
 
         return apply_filters( 'bp_has_activities', $activities_template->has_activities(), &$activities_template );
@@ -481 +482 @@
 
                 foreach ( (array) $component_names as $component_name ) {
+                        /* Skip the activity comment filter */
+                        if ( 'activity' == $component_name )
+                                continue;
+
                         if ( isset( $_GET['afilter'] ) && $component_name == $_GET['afilter'] )
                                 $selected = ' class="selected"';