Changeset 5302 for trunk/bp-members/bp-members-template.php

Timestamp:

11/08/2011 01:24:47 AM (13 years ago)

Author:

johnjamesjacoby

Message:

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

File:

• trunk/bp-members/bp-members-template.php (modified) (6 diffs)

trunk/bp-members/bp-members-template.php

@@ -467 +467 @@
 function bp_member_is_loggedin_user() {
     global $bp, $members_template;
-    return apply_filters( 'bp_member_is_loggedin_user', $bp->loggedin_user->id == $members_template->member->id ? true : false );
+    return apply_filters( 'bp_member_is_loggedin_user', bp_loggedin_user_id() == $members_template->member->id ? true : false );
 }
 
@@ -721 +721 @@
             if ( bp_is_active( 'friends' ) ) {
                 if ( $nav_item['css_id'] == $bp->friends->id ) {
-                    if ( friends_check_friendship( $bp->loggedin_user->id, bp_displayed_user_id() ) )
+                    if ( friends_check_friendship( bp_loggedin_user_id(), bp_displayed_user_id() ) )
                         $selected = ' class="current selected"';
                 }
@@ -784 +784 @@
         extract( $r, EXTR_SKIP );
 
-        return apply_filters( 'bp_get_loggedin_user_avatar', bp_core_fetch_avatar( array( 'item_id' => $bp->loggedin_user->id, 'type' => $type, 'width' => $width, 'height' => $height, 'html' => $html, 'alt' => $alt ) ) );
+        return apply_filters( 'bp_get_loggedin_user_avatar', bp_core_fetch_avatar( array( 'item_id' => bp_loggedin_user_id(), 'type' => $type, 'width' => $width, 'height' => $height, 'html' => $html, 'alt' => $alt ) ) );
     }
 
@@ -881 +881 @@
     return apply_filters( 'bp_displayed_user_id', $id );
 }
-    function bp_current_user_id() { return bp_displayed_user_id(); }
 
 function bp_loggedin_user_id() {
@@ -894 +893 @@
     return apply_filters( 'bp_loggedin_user_id', $id );
 }
+
+function bp_current_user_id() { return bp_loggedin_user_id(); }
 
 function bp_displayed_user_domain() {
@@ -944 +945 @@
         global $bp;
 
-        if ( !empty( $bp->loggedin_user->id ) ) {
-            $username = bp_core_get_username( $bp->loggedin_user->id, $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login );
+        if ( bp_loggedin_user_id() ) {
+            $username = bp_core_get_username( bp_loggedin_user_id(), $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login );
         } else {
             $username = '';