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

Timestamp:

07/25/2011 12:29:19 AM (15 years ago)

Author:

boonebgorges

Message:

Global/slug audit in Core and Activity components. Fixes #3325

File:

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

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

@@ -23 +23 @@
 
     // No activity to display
-    if ( empty( $bp->action_variables[0] ) || !is_numeric( $bp->action_variables[0] ) )
+    if ( !bp_action_variable( 0 ) || !is_numeric( bp_action_variable( 0 ) ) )
         return false;
 
     // Get the activity details
-    $activity = bp_activity_get_specific( array( 'activity_ids' => $bp->action_variables[0], 'show_hidden' => true ) );
+    $activity = bp_activity_get_specific( array( 'activity_ids' => bp_action_variable( 0 ), 'show_hidden' => true ) );
 
     // 404 if activity does not exist
@@ -88 +88 @@
         return false;
 
-    if ( empty( $activity_id ) && !empty( $bp->action_variables[0] ) && is_numeric( $bp->action_variables[0] ) )
-        $activity_id = (int) $bp->action_variables[0];
+    if ( empty( $activity_id ) && bp_action_variable( 0 ) )
+        $activity_id = (int) bp_action_variable( 0 );
 
     // Not viewing a specific activity item
@@ -212 +212 @@
     check_admin_referer( 'mark_favorite' );
 
-    if ( bp_activity_add_user_favorite( $bp->action_variables[0] ) )
+    if ( bp_activity_add_user_favorite( bp_action_variable( 0 ) ) )
         bp_core_add_message( __( 'Activity marked as favorite.', 'buddypress' ) );
     else
         bp_core_add_message( __( 'There was an error marking that activity as a favorite, please try again.', 'buddypress' ), 'error' );
 
-    bp_core_redirect( wp_get_referer() . '#activity-' . $bp->action_variables[0] );
+    bp_core_redirect( wp_get_referer() . '#activity-' . bp_action_variable( 0 ) );
 }
 add_action( 'bp_actions', 'bp_activity_action_mark_favorite' );
@@ -230 +230 @@
     check_admin_referer( 'unmark_favorite' );
 
-    if ( bp_activity_remove_user_favorite( $bp->action_variables[0] ) )
+    if ( bp_activity_remove_user_favorite( bp_action_variable( 0 ) ) )
         bp_core_add_message( __( 'Activity removed as favorite.', 'buddypress' ) );
     else
         bp_core_add_message( __( 'There was an error removing that activity as a favorite, please try again.', 'buddypress' ), 'error' );
 
-    bp_core_redirect( wp_get_referer() . '#activity-' . $bp->action_variables[0] );
+    bp_core_redirect( wp_get_referer() . '#activity-' . bp_action_variable( 0 ) );
 }
 add_action( 'bp_actions', 'bp_activity_action_remove_favorite' );
@@ -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() ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
+    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 ) )
         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() ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
+    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 ) )
         return false;
 
@@ -298 +298 @@
     global $bp, $wp_query;
 
-    if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'mentions' ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
+    if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !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' ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
+    if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'favorites' ) || !bp_is_action_variable( 'feed', 0 ) )
         return false;