Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
07/12/2011 01:52:18 AM (14 years ago)
Author:
johnjamesjacoby
Message:

Audit the usage of $bp->activity->slug. See #3325.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-activity/bp-activity-actions.php

    r4548 r4646  
    1717
    1818    // 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' ) )
    2020        return false;
    2121
     
    4444        // Activity is a user update
    4545        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 . '/';
    4747
    4848        // Activity is something else
     
    5151            // Set redirect to group activity stream
    5252            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 . '/';
    5454            }
    5555        }
     
    5757    // Set redirect to users' activity stream
    5858    } 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;
    6060    }
    6161
     
    126126
    127127    // 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' ) )
    129129        return false;
    130130
     
    172172    global $bp;
    173173
    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' ) )
    175175        return false;
    176176
     
    204204    global $bp;
    205205
    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' ) )
    207207        return false;
    208208
     
    222222    global $bp;
    223223
    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' ) )
    225225        return false;
    226226
Note: See TracChangeset for help on using the changeset viewer.