Changeset 4519

Timestamp:

06/15/2011 09:00:32 PM (15 years ago)

Author:

djpaul

Message:

Fix Group activity permalinks for private / hidden groups. Fixes #3210, props r-a-y

Location:

trunk

Files:

• bp-activity/bp-activity-actions.php (modified) (1 diff)
• bp-activity/bp-activity-screens.php (modified) (1 diff)
• bp-themes/bp-default/members/single/activity/permalink.php (modified) (1 diff)

trunk/bp-activity/bp-activity-actions.php

@@ -25 +25 @@
 
     // Get the activity details
-    $activity = bp_activity_get_specific( array( 'activity_ids' => $bp->action_variables[0] ) );
+    $activity = bp_activity_get_specific( array( 'activity_ids' => $bp->action_variables[0], 'show_hidden' => true ) );
 
     // 404 if activity does not exist

trunk/bp-activity/bp-activity-screens.php

@@ -94 +94 @@
     
     // Get the activity details
-    $activity = bp_activity_get_specific( array( 'activity_ids' => bp_current_action() ) );
+    $activity = bp_activity_get_specific( array( 'activity_ids' => bp_current_action(), 'show_hidden' => true ) );
 
     // 404 if activity does not exist
-    if ( !$activity = $activity['activities'][0] ) {
+    if ( empty( $activity['activities'][0] ) || !empty( $bp->action_variables ) ) {
         bp_do_404();
         return;
-    }
-
-    if ( !empty( $bp->action_variables ) ) {
-        bp_do_404();
-        return;
+
+    } else {
+        $activity = $activity['activities'][0];
+        if ( empty( $activity ) ) {
+            bp_do_404();
+            return;
+        }
     }
 

trunk/bp-themes/bp-default/members/single/activity/permalink.php

@@ -2 +2 @@
 
 <div class="activity no-ajax" role="main">
-    <?php if ( bp_has_activities( 'display_comments=threaded&include=' . bp_current_action() ) ) : ?>
+    <?php if ( bp_has_activities( 'display_comments=threaded&show_hidden=true&include=' . bp_current_action() ) ) : ?>
 
         <ul id="activity-stream" class="activity-list item-list">