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-members/bp-members-loader.php

    r5300 r5301  
    8989        /** Displayed user ****************************************************/
    9090
    91         // The user id of the user currently being viewed:
    92         // $bp->displayed_user->id is set in /bp-core/bp-core-catchuri.php
    93         if ( empty( $bp->displayed_user->id ) )
    94             $bp->displayed_user->id = 0;
    95 
    9691        // The domain for the user currently being displayed
    97         $bp->displayed_user->domain   = bp_core_get_user_domain( $bp->displayed_user->id );
     92        $bp->displayed_user->domain   = bp_core_get_user_domain( bp_displayed_user_id() );
    9893
    9994        // The core userdata of the user who is currently being displayed
    100         $bp->displayed_user->userdata = bp_core_get_core_userdata( $bp->displayed_user->id );
     95        $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id() );
    10196
    10297        // Fetch the full name displayed user
    103         $bp->displayed_user->fullname = bp_core_get_user_displayname( $bp->displayed_user->id );
     98        $bp->displayed_user->fullname = bp_core_get_user_displayname( bp_displayed_user_id() );
    10499
    105100        /** Profiles Fallback *************************************************/
     
    120115        }
    121116
    122         if ( !$bp->current_component && $bp->displayed_user->id )
     117        if ( !$bp->current_component && bp_displayed_user_id() )
    123118            $bp->current_component = $bp->default_component;
    124119    }
     
    178173        } elseif( bp_is_user() ) {
    179174            $bp->bp_options_avatar = bp_core_fetch_avatar( array(
    180                 'item_id' => $bp->displayed_user->id,
     175                'item_id' => bp_displayed_user_id(),
    181176                'type'    => 'thumb'
    182177            ) );
Note: See TracChangeset for help on using the changeset viewer.