Ticket #2544: 2544-3.patch

bp-activity/bp-activity-functions.php

@@ -669 +669 @@
 
         // Check to see if the parent activity is hidden, and if so, hide this comment publically.
         $activity = new BP_Activity_Activity( $activity_id );
-        $is_hidden = ( (int)$activity->hide_sitewide ) ? 1 : 0;
+        $is_hidden = ( (int)$activity->hide_sitewide ) ? true : false;
 
         // Insert the activity comment
         $comment_id = bp_activity_add( array(

bp-activity/bp-activity-template.php

@@ -288 +288 @@
 
                 // are we displaying user specific activity?
                 if ( is_numeric( $user_id ) ) {
-                        $show_hidden = ( $user_id == $bp->loggedin_user->id && $scope != 'friends' ) ? 1 : 0;
+                        $show_hidden = ( $user_id == $bp->loggedin_user->id && $scope != 'friends' ) ? true : false;
 
                         switch ( $scope ) {
                                 case 'friends':

bp-activity/bp-activity-classes.php

@@ -115 +115 @@
                         $sort = 'DESC';
 
                 // Hide Hidden Items?
-                if ( !$show_hidden )
-                        $where_conditions['hidden_sql'] = "a.hide_sitewide = 0";
+                if ( !is_bool( $show_hidden ) && !empty( $show_hidden ) )
+                        $visibility = $show_hidden;
+                elseif ( !$show_hidden )
+                        $visibility = '0';
+                else
+                        $visibility = '0, 1';
 
+                $where_conditions['hidden_sql'] = "a.hide_sitewide IN ({$visibility})";
+
                 // Exclude specified items
                 if ( $exclude )
                         $where_conditions['exclude'] = "a.id NOT IN ({$exclude})";