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

Timestamp:

02/01/2011 09:47:50 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Allow individual activity stream comments and forum replies to appear in favorites listings

File:

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

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

@@ -17 +17 @@
 
     // Not viewing activity
-    if ( ( $bp->current_component != $bp->activity->id ) || ( $bp->current_action != 'p' ) )
+    if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'p' ) )
         return false;
 
@@ -68 +68 @@
 
     // Not viewing activity or action is not delete
-    if ( ( $bp->current_component != $bp->activity->id ) || ( $bp->current_action != 'delete' ) )
+    if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'delete' ) )
         return false;
 
@@ -106 +106 @@
 
     // Do not proceed if user is not logged in, not viewing activity, or not posting
-    if ( !is_user_logged_in() || ( $bp->current_component != $bp->activity->id ) || ( 'post' != $bp->current_action ) )
+    if ( !is_user_logged_in() || ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'post' ) )
         return false;
 
@@ -152 +152 @@
     global $bp;
 
-    if ( !is_user_logged_in() || $bp->current_component != $bp->activity->id || $bp->current_action != 'reply' )
+    if ( !is_user_logged_in() || ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'reply' ) )
         return false;
 
@@ -184 +184 @@
     global $bp;
 
-    if ( !is_user_logged_in() || $bp->current_component != $bp->activity->slug || $bp->current_action != 'favorite' )
-        return false;
-
-    /* Check the nonce */
+    if ( !is_user_logged_in() || ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'favorite' ) )
+        return false;
+
+    // Check the nonce
     check_admin_referer( 'mark_favorite' );
 
@@ -202 +202 @@
     global $bp;
 
-    if ( !is_user_logged_in() || $bp->current_component != $bp->activity->slug || $bp->current_action != 'unfavorite' )
-        return false;
-
-    /* Check the nonce */
+    if ( !is_user_logged_in() || ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'unfavorite' ) )
+        return false;
+
+    // Check the nonce
     check_admin_referer( 'unmark_favorite' );
 
@@ -220 +220 @@
     global $bp, $wp_query;
 
-    if ( $bp->current_component != $bp->activity->slug || $bp->current_action != 'feed' || ( isset( $bp->displayed_user->id ) && $bp->displayed_user->id ) || isset( $bp->groups->current_group ) )
+    if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'feed' ) || bp_is_user() || isset( $bp->groups->current_group ) )
         return false;
 
@@ -234 +234 @@
     global $bp, $wp_query;
 
-    if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'feed' )
+    if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_user() || !bp_is_current_action( 'feed' ) )
         return false;
 
@@ -248 +248 @@
     global $bp, $wp_query;
 
-    if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != $bp->friends->slug || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
+    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' )
         return false;
 
@@ -262 +262 @@
     global $bp, $wp_query;
 
-    if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != $bp->groups->slug || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
+    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' )
         return false;
 
@@ -276 +276 @@
     global $bp, $wp_query;
 
-    if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'mentions' || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
+    if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_user() || !bp_is_current_action( 'mentions' ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
         return false;
 
@@ -290 +290 @@
     global $bp, $wp_query;
 
-    if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'favorites' || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
+    if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_user() || !bp_is_current_action( 'favorites' ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
         return false;