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

Timestamp:

08/31/2011 01:12:04 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Audit _is_ functions and _current_component_ functions. Props r-a-y. Fixes #3399.

File:

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

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

@@ -242 +242 @@
     global $bp, $wp_query;
 
-    if ( !bp_is_current_component( 'activity' ) || !bp_is_current_action( 'feed' ) || bp_is_user() || !empty( $bp->groups->current_group ) )
+    if ( !bp_is_activity_component() || !bp_is_current_action( 'feed' ) || bp_is_user() || !empty( $bp->groups->current_group ) )
         return false;
 
@@ -256 +256 @@
     global $bp, $wp_query;
 
-    if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'feed' ) )
+    if ( !bp_is_user_activity() || !bp_is_current_action( 'feed' ) )
         return false;
 
@@ -270 +270 @@
     global $bp, $wp_query;
 
-    if ( !bp_is_active( 'friends' ) || !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( bp_get_friends_slug() ) || !bp_is_action_variable( 'feed', 0 ) )
+    if ( !bp_is_active( 'friends' ) || !bp_is_user_activity() || !bp_is_current_action( bp_get_friends_slug() ) || !bp_is_action_variable( 'feed', 0 ) )
         return false;
 
@@ -284 +284 @@
     global $bp, $wp_query;
 
-    if ( !bp_is_active( 'groups' ) || !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( bp_get_groups_slug() ) || !bp_is_action_variable( 'feed', 0 ) )
+    if ( !bp_is_active( 'groups' ) || !bp_is_user_activity() || !bp_is_current_action( bp_get_groups_slug() ) || !bp_is_action_variable( 'feed', 0 ) )
         return false;
 
@@ -298 +298 @@
     global $bp, $wp_query;
 
-    if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'mentions' ) || !bp_is_action_variable( 'feed', 0 ) )
+    if ( !bp_is_user_activity() || !bp_is_current_action( 'mentions' ) || !bp_is_action_variable( 'feed', 0 ) )
         return false;
 
@@ -312 +312 @@
     global $bp, $wp_query;
 
-    if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'favorites' ) || !bp_is_action_variable( 'feed', 0 ) )
+    if ( !bp_is_user_activity() || !bp_is_current_action( 'favorites' ) || !bp_is_action_variable( 'feed', 0 ) )
         return false;