Changeset 4111

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)

Location:

branches/1.2

Files:

• bp-activity.php (modified) (3 diffs)
• bp-activity/bp-activity-classes.php (modified) (2 diffs)
• bp-activity/bp-activity-templatetags.php (modified) (1 diff)

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 )

branches/1.2/bp-activity/bp-activity-classes.php

@@ -167 +167 @@
         }
 
-        function get_specific( $activity_ids, $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $display_comments = false ) {
+        function get_specific( $activity_ids, $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $display_comments = false, $show_hidden = false ) {
                 global $wpdb, $bp;
 
@@ -184 +184 @@
                         $sort = 'DESC';
 
-                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids}) ORDER BY date_recorded {$sort} $pag_sql" ) );
-                $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids})" ) );
+                // Hide Hidden Items?
+                if ( !$show_hidden )
+                        $hidden_sql = "AND hide_sitewide = 0";
+                else
+                        $hidden_sql = '';
+
+                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids}) {$hidden_sql} ORDER BY date_recorded {$sort} {$pag_sql}" ) );
+                $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids}) {$hidden_sql}" ) );
 
                 if ( $display_comments )

branches/1.2/bp-activity/bp-activity-templatetags.php

@@ -30 +30 @@
                 // Fetch specific activity items based on ID's
                 if ( !empty( $include ) )
-                        $this->activities = bp_activity_get_specific( array( 'activity_ids' => explode( ',', $include ), 'max' => $max, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'sort' => $sort, 'display_comments' => $display_comments ) );
+                        $this->activities = bp_activity_get_specific( array( 'activity_ids' => explode( ',', $include ), 'max' => $max, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'sort' => $sort, 'display_comments' => $display_comments, 'show_hidden' => $show_hidden ) );
                 // Fetch all activity items
                 else