Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
11/08/2011 01:14:31 AM (13 years ago)
Author:
johnjamesjacoby
Message:

Use bp_displayed_user_id() rather than reference the $bp->displayed_user->id global var directly. First step at consolidating user ID checks to use WP_User class later. See #3738.

File:
1 edited

Legend:

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

    r5262 r5301  
    265265
    266266    // User filtering
    267     if ( !empty( $bp->displayed_user->id ) )
    268         $user_id = $bp->displayed_user->id;
     267    if ( bp_displayed_user_id() )
     268        $user_id = bp_displayed_user_id();
    269269
    270270    // Group filtering
     
    325325        // determine which user_id applies
    326326        if ( empty( $user_id ) )
    327             $user_id = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
     327            $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : $bp->loggedin_user->id;
    328328
    329329        // are we displaying user specific activity?
     
    361361                    break;
    362362                case 'mentions':
    363                     $user_nicename    = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->userdata->user_nicename : $bp->loggedin_user->userdata->user_nicename;
    364                     $user_login       = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->userdata->user_login : $bp->loggedin_user->userdata->user_login;
     363                    $user_nicename    = ( bp_displayed_user_id() ) ? $bp->displayed_user->userdata->user_nicename : $bp->loggedin_user->userdata->user_nicename;
     364                    $user_login       = ( bp_displayed_user_id() ) ? $bp->displayed_user->userdata->user_login : $bp->loggedin_user->userdata->user_login;
    365365                    $search_terms     = '@' . bp_core_get_username( $user_id, $user_nicename, $user_login ) . '<'; // Start search at @ symbol and stop search at closing tag delimiter.
    366366                    $display_comments = 'stream';
     
    20442044
    20452045        if ( !$user_id )
    2046             $user_id = $bp->displayed_user->id;
     2046            $user_id = bp_displayed_user_id();
    20472047
    20482048        if ( bp_core_is_user_spammer( $user_id ) || bp_core_is_user_deleted( $user_id ) )
     
    23102310            return false;
    23112311
    2312         return apply_filters( 'bp_get_send_public_message_link', wp_nonce_url( bp_loggedin_user_domain() . bp_get_activity_slug() . '/?r=' . bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) );
     2312        return apply_filters( 'bp_get_send_public_message_link', wp_nonce_url( bp_loggedin_user_domain() . bp_get_activity_slug() . '/?r=' . bp_core_get_username( bp_displayed_user_id(), $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) );
    23132313    }
    23142314
Note: See TracChangeset for help on using the changeset viewer.