Changeset 4055 for trunk/bp-activity/bp-activity-actions.php

Timestamp:

02/18/2011 04:17:47 PM (14 years ago)

Author:

boonebgorges

Message:

Check that components are active before checking to see whether we're looking at their activity feeds. Fixes #3069, props johnpbloch

File:

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

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

@@ -248 +248 @@
     global $bp, $wp_query;
 
-    if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_user() || !bp_is_current_action( $bp->friends->slug ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
+    if ( !bp_is_active( 'friends' ) || $bp->activity->slug != bp_current_component() || !bp_is_user() || !bp_is_current_action( $bp->friends->slug ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
         return false;
 
@@ -262 +262 @@
     global $bp, $wp_query;
 
-    if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_user() || !bp_is_current_action( $bp->groups->slug ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
+    if ( !bp_is_active( 'groups' ) || $bp->activity->slug != bp_current_component() || !bp_is_user() || !bp_is_current_action( $bp->groups->slug ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
         return false;