Changeset 5302 for trunk/bp-messages/bp-messages-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-messages/bp-messages-template.php (modified) (5 diffs)

trunk/bp-messages/bp-messages-template.php

@@ -128 +128 @@
                 if ( 'inbox' == $this->box ) {
                     foreach ( (array)$this->thread->messages as $key => $message ) {
-                        if ( $bp->loggedin_user->id != $message->sender_id ) {
+                        if ( bp_loggedin_user_id() != $message->sender_id ) {
                             $last_message_index = $key;
                             break;
@@ -136 +136 @@
                 } elseif ( 'sentbox' == $this->box ) {
                     foreach ( (array)$this->thread->messages as $key => $message ) {
-                        if ( $bp->loggedin_user->id == $message->sender_id ) {
+                        if ( bp_loggedin_user_id() == $message->sender_id ) {
                             $last_message_index = $key;
                             break;
@@ -160 +160 @@
 
     $defaults = array(
-        'user_id' => $bp->loggedin_user->id,
+        'user_id' => bp_loggedin_user_id(),
         'box' => 'inbox',
         'per_page' => 10,
@@ -174 +174 @@
     } else {
         if ( 'inbox' == $bp->current_action )
-            bp_core_delete_notifications_by_type( $bp->loggedin_user->id, $bp->messages->id, 'new_message' );
+            bp_core_delete_notifications_by_type( bp_loggedin_user_id(), $bp->messages->id, 'new_message' );
 
         if ( 'sentbox' == $bp->current_action )
@@ -781 +781 @@
 
         foreach( (array)$thread_template->thread->recipients as $recipient ) {
-            if ( $recipient->user_id !== $bp->loggedin_user->id )
+            if ( $recipient->user_id !== bp_loggedin_user_id() )
                 $recipient_links[] = bp_core_get_userlink( $recipient->user_id );
         }