Changeset 4111 for branches/1.2/bp-activity.php

Timestamp:

03/11/2011 08:04:13 PM (15 years ago)

Author:

djpaul

Message:

Fix favourited activity items from hidden groups showing in members' profiles. Fixes #2678 (branch)

File:

• branches/1.2/bp-activity.php (modified) (3 diffs)

branches/1.2/bp-activity.php

@@ -611 +611 @@
 function bp_activity_get_specific( $args = '' ) {
     $defaults = array(
-        'activity_ids' => false, // A single activity_id or array of IDs.
-        'page' => 1, // page 1 without a per_page will result in no pagination.
-        'per_page' => false, // results per page
-        'max' => false, // Maximum number of results to return
-        'sort' => 'DESC', // sort ASC or DESC
-        'display_comments' => false // true or false to display threaded comments for these specific activity items
+        'activity_ids'     => false,  // A single activity_id or array of IDs.
+        'page'             => 1,      // page 1 without a per_page will result in no pagination.
+        'per_page'         => false,  // results per page
+        'max'              => false,  // Maximum number of results to return
+        'sort'             => 'DESC', // sort ASC or DESC
+        'display_comments' => false,  // true or false to display threaded comments for these specific activity items
+        'show_hidden'      => false
     );
 
@@ -622 +623 @@
     extract( $r, EXTR_SKIP );
 
-    return apply_filters( 'bp_activity_get_specific', BP_Activity_Activity::get_specific( $activity_ids, $max, $page, $per_page, $sort, $display_comments ) );
+    return apply_filters( 'bp_activity_get_specific', BP_Activity_Activity::get_specific( $activity_ids, $max, $page, $per_page, $sort, $display_comments, $show_hidden ) );
 }
 
@@ -995 +996 @@
 function bp_activity_get_user_favorites( $user_id ) {
     $my_favs = maybe_unserialize( get_user_meta( $user_id, 'bp_favorite_activities', true ) );
-    $existing_favs = bp_activity_get_specific( array( 'activity_ids' => $my_favs ) );
+    $existing_favs = bp_activity_get_specific( array( 'activity_ids' => $my_favs, 'show_hidden' => true ) );
 
     foreach( (array)$existing_favs['activities'] as $fav )