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

trunk/bp-messages/bp-messages-classes.php

@@ -39 +39 @@
 
         // Get the unread count for the logged in user
-        if ( isset( $this->recipients[$bp->loggedin_user->id] ) )
-            $this->unread_count = $this->recipients[$bp->loggedin_user->id]->unread_count;
+        if ( isset( $this->recipients[bp_loggedin_user_id()] ) )
+            $this->unread_count = $this->recipients[bp_loggedin_user_id()]->unread_count;
     }
 
@@ -67 +67 @@
         global $wpdb, $bp;
 
-        $delete_for_user = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET is_deleted = 1 WHERE thread_id = %d AND user_id = %d", $thread_id, $bp->loggedin_user->id ) );
+        $delete_for_user = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET is_deleted = 1 WHERE thread_id = %d AND user_id = %d", $thread_id, bp_loggedin_user_id() ) );
 
         // Check to see if any more recipients remain for this message
@@ -123 +123 @@
         global $wpdb, $bp;
 
-        $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 0 WHERE user_id = %d AND thread_id = %d", $bp->loggedin_user->id, $thread_id );
+        $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 0 WHERE user_id = %d AND thread_id = %d", bp_loggedin_user_id(), $thread_id );
         $wpdb->query($sql);
     }
@@ -130 +130 @@
         global $wpdb, $bp;
 
-        $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 1 WHERE user_id = %d AND thread_id = %d", $bp->loggedin_user->id, $thread_id );
+        $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 1 WHERE user_id = %d AND thread_id = %d", bp_loggedin_user_id(), $thread_id );
         $wpdb->query($sql);
     }
@@ -157 +157 @@
             return false;
 
-        return in_array( $bp->loggedin_user->id, $sender_ids );
+        return in_array( bp_loggedin_user_id(), $sender_ids );
     }
 
@@ -173 +173 @@
 
         if ( empty( $user_id ) )
-            $user_id = $bp->loggedin_user->id;
+            $user_id = bp_loggedin_user_id();
 
         $sql = $wpdb->prepare( "SELECT SUM(unread_count) FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0 AND sender_only = 0", $user_id );
@@ -188 +188 @@
 
         if ( empty( $user_id ) )
-            $user_id = $bp->loggedin_user->id;
+            $user_id = bp_loggedin_user_id();
 
         return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d AND user_id = %d", $thread_id, $user_id ) );
@@ -259 +259 @@
 
         $this->date_sent = bp_core_current_time();
-        $this->sender_id = $bp->loggedin_user->id;
+        $this->sender_id = bp_loggedin_user_id();
 
         if ( !empty( $id ) )
@@ -355 +355 @@
         global $wpdb, $bp;
 
-        return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_messages} WHERE sender_id = %d AND thread_id = %d ORDER BY date_sent DESC LIMIT 1", $bp->loggedin_user->id, $thread_id ) );
+        return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_messages} WHERE sender_id = %d AND thread_id = %d ORDER BY date_sent DESC LIMIT 1", bp_loggedin_user_id(), $thread_id ) );
     }
 
@@ -422 +422 @@
         $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_notices} SET is_active = 0 WHERE id != %d", $id ) );
 
-        bp_update_user_meta( $bp->loggedin_user->id, 'last_activity', bp_core_current_time() );
+        bp_update_user_meta( bp_loggedin_user_id(), 'last_activity', bp_core_current_time() );
 
         do_action_ref_array( 'messages_notice_after_save', array( &$this ) );