Changeset 4646 for trunk/bp-activity/bp-activity-actions.php
- Timestamp:
- 07/12/2011 01:52:18 AM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-activity/bp-activity-actions.php
r4548 r4646 17 17 18 18 // Not viewing activity 19 if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'p' ) )19 if ( ( bp_is_activity_component() ) || !bp_is_current_action( 'p' ) ) 20 20 return false; 21 21 … … 44 44 // Activity is a user update 45 45 if ( !empty( $activity->user_id ) ) { 46 $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . $bp->activity->slug. '/' . $activity->id . '/';46 $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . bp_get_activity_slug() . '/' . $activity->id . '/'; 47 47 48 48 // Activity is something else … … 51 51 // Set redirect to group activity stream 52 52 if ( $group = groups_get_group( array( 'group_id' => $activity->item_id ) ) ) { 53 $redirect = bp_get_group_permalink( $group ) . $bp->activity->slug. '/' . $activity->id . '/';53 $redirect = bp_get_group_permalink( $group ) . bp_get_activity_slug() . '/' . $activity->id . '/'; 54 54 } 55 55 } … … 57 57 // Set redirect to users' activity stream 58 58 } else { 59 $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . $bp->activity->slug. '/' . $activity->id;59 $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . bp_get_activity_slug() . '/' . $activity->id; 60 60 } 61 61 … … 126 126 127 127 // Do not proceed if user is not logged in, not viewing activity, or not posting 128 if ( !is_user_logged_in() || ( $bp->activity->slug != bp_current_component()) || !bp_is_current_action( 'post' ) )128 if ( !is_user_logged_in() || bp_is_activity_component() || !bp_is_current_action( 'post' ) ) 129 129 return false; 130 130 … … 172 172 global $bp; 173 173 174 if ( !is_user_logged_in() || ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'reply' ) )174 if ( !is_user_logged_in() || ( bp_is_activity_component() ) || !bp_is_current_action( 'reply' ) ) 175 175 return false; 176 176 … … 204 204 global $bp; 205 205 206 if ( !is_user_logged_in() || ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'favorite' ) )206 if ( !is_user_logged_in() || ( bp_is_activity_component() ) || !bp_is_current_action( 'favorite' ) ) 207 207 return false; 208 208 … … 222 222 global $bp; 223 223 224 if ( !is_user_logged_in() || ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'unfavorite' ) )224 if ( !is_user_logged_in() || ( bp_is_activity_component() ) || !bp_is_current_action( 'unfavorite' ) ) 225 225 return false; 226 226
Note: See TracChangeset
for help on using the changeset viewer.