Changeset 3480

Timestamp:

11/23/2010 11:17:59 PM (16 years ago)

Author:

boonebgorges

Message:

Adds parameter to bp_has_activities chain to allow filters to apply only within a given set of activity ids. Fixes activity filtering on Favorites tab. Fixes #2442

Location:

trunk

Files:

• bp-activity.php (modified) (2 diffs)
• bp-activity/bp-activity-classes.php (modified) (2 diffs)
• bp-activity/bp-activity-templatetags.php (modified) (6 diffs)

trunk/bp-activity.php

@@ -609 +609 @@
                 'show_hidden' => false, // Show activity items that are hidden site-wide?
                 'exclude' => false, // Comma-separated list of activity IDs to exclude
+                'in' => false, // Comma-separated list or array of activity IDs to which you want to limit the query
 
                 /**
@@ -633 +634 @@
                 }
         } else
-                $activity = BP_Activity_Activity::get( $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden, $exclude );
+                $activity = BP_Activity_Activity::get( $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden, $exclude, $in );
 
         return apply_filters( 'bp_activity_get', $activity, &$r );

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

@@ -89 +89 @@
         // Static Functions
 
-        function get( $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false, $show_hidden = false, $exclude = false ) {
+        function get( $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false, $show_hidden = false, $exclude = false, $in = false ) {
                 global $wpdb, $bp;
 
@@ -121 +121 @@
                 if ( $exclude )
                         $where_conditions['exclude'] = "a.id NOT IN ({$exclude})";
+                
+                // The specific ids to which you want to limit the query
+                if ( !empty( $in ) ) {
+                        if ( is_array( $in ) )
+                                $in = implode( ',', $in );
+                        $where_conditions['in'] = "a.id IN ({$in})";
+                }
 
                 // Alter the query based on whether we want to show activity item comments in the stream like normal comments or threaded below the activity

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, $exclude ) {
+        function bp_activity_template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude, $in ) {
                 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, 'exclude' => $exclude ) );
+                        $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, 'in' => $in ) );
 
                 if ( !$max || $max >= (int)$this->activities['total'] )
@@ -144 +144 @@
         $include = false;
         $exclude = false;
+        $in = false;
         $show_hidden = false;
         $object = false;
@@ -170 +171 @@
                 'include' => $include, // pass an activity_id or string of IDs comma-separated
                 'exclude' => $exclude, // pass an activity_id or string of IDs comma-separated
+                'in' => $in, // comma-separated list or array of activity IDs among which to search
                 'sort' => 'DESC', // sort DESC or ASC
                 'page' => 1, // which page to load
@@ -232 +234 @@
                                                 return false;
 
-                                        $include = implode( ',', (array)$favs );
+                                        $in = implode( ',', (array)$favs );
                                         break;
                                 case 'mentions':
@@ -257 +259 @@
                 $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, $exclude );
+        $activities_template = new BP_Activity_Template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude, $in );
 
         return apply_filters( 'bp_has_activities', $activities_template->has_activities(), $activities_template );