Changeset 3844 for trunk/bp-activity/bp-activity-screens.php

Timestamp:

01/22/2011 04:35:59 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Fix single activity stream items redirecting when activity directory is off of root.

File:

• trunk/bp-activity/bp-activity-screens.php (modified) (2 diffs)

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

@@ -99 +99 @@
 
     // No displayed user or not viewing activity component
-    if ( empty( $bp->displayed_user->id ) || $bp->current_component != $bp->activity->id )
+    if ( !bp_is_activity_component() )
         return false;
 
     // No current action or not a specific activity item
-    if ( empty( $bp->current_action ) || !is_numeric( $bp->current_action ) )
-        return false;
+    if ( !bp_current_action() || !bp_is_current_action( 'p' ) || !isset( $bp->action_variables['0'] ) )
+        return false;
+
+    // RE-jig the action and action variables
+    $bp->current_action = $bp->action_variables['0'];
+    unset( $bp->action_variables['0'] );
 
     // 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() ) );
 
     if ( !$activity = $activity['activities'][0] )
@@ -115 +119 @@
     $has_access = true;
 
-    // Redirect based on the type of activity
+    // If activity is from a group, do an extra cap check
     if ( isset( $bp->groups->id ) && $activity->component == $bp->groups->id ) {
 
-        // This should never happen, but we'll check it anyways
+        // Activity is from a group, but groups is currently disabled
         if ( !bp_is_active( 'groups') )
             bp_core_redirect( $bp->root_domain );