Changeset 5301 for trunk/bp-activity/bp-activity-template.php
- Timestamp:
- 11/08/2011 01:14:31 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-activity/bp-activity-template.php
r5262 r5301 265 265 266 266 // 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(); 269 269 270 270 // Group filtering … … 325 325 // determine which user_id applies 326 326 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; 328 328 329 329 // are we displaying user specific activity? … … 361 361 break; 362 362 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; 365 365 $search_terms = '@' . bp_core_get_username( $user_id, $user_nicename, $user_login ) . '<'; // Start search at @ symbol and stop search at closing tag delimiter. 366 366 $display_comments = 'stream'; … … 2044 2044 2045 2045 if ( !$user_id ) 2046 $user_id = $bp->displayed_user->id;2046 $user_id = bp_displayed_user_id(); 2047 2047 2048 2048 if ( bp_core_is_user_spammer( $user_id ) || bp_core_is_user_deleted( $user_id ) ) … … 2310 2310 return false; 2311 2311 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 ) ) ); 2313 2313 } 2314 2314
Note: See TracChangeset
for help on using the changeset viewer.