Changeset 5696 for trunk/bp-messages/bp-messages-classes.php

Timestamp:

02/10/2012 09:02:53 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in Messages component. See #3989.

File:

• trunk/bp-messages/bp-messages-classes.php (modified) (9 diffs)

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

@@ -1 +1 @@
 <?php
+
+/**
+ * BuddyPress Messages Classes
+ *
+ * @package BuddyPress
+ * @subpackage MessagesClasses
+ */
+
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
 
-Class BP_Messages_Thread {
+class BP_Messages_Thread {
     var $thread_id;
     var $messages;
@@ -11 +19 @@
     var $unread_count;
 
-    function bp_messages_thread ( $thread_id = false, $order = 'ASC' ) {
-        $this->__construct( $thread_id, $order);
-    }
-
     function __construct( $thread_id = false, $order = 'ASC' ) {
         if ( $thread_id )
@@ -54 +58 @@
         global $wpdb, $bp;
 
-        $results = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d", $this->thread_id ) );
-
-        foreach ( (array)$results as $recipient )
+        $recipients = array();
+        $results    = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d", $this->thread_id ) );
+
+        foreach ( (array) $results as $recipient )
             $recipients[$recipient->user_id] = $recipient;
 
@@ -203 +208 @@
             return count( $recipients ) . __(' Recipients', 'buddypress');
 
+        $recipient_links = array();
+
         foreach ( (array)$recipients as $recipient )
             $recipient_links[] = bp_core_get_userlink( $recipient->user_id );
@@ -241 +248 @@
 }
 
-Class BP_Messages_Message {
+class BP_Messages_Message {
     var $id;
     var $thread_id;
@@ -251 +258 @@
     var $recipients = false;
 
-    function bp_messages_message( $id = null ) {
-        $this->__construct( $id );
-    }
-
     function __construct( $id = null ) {
-        global $bp;
-
         $this->date_sent = bp_core_current_time();
         $this->sender_id = bp_loggedin_user_id();
@@ -344 +345 @@
         if ( is_array( $recipient_usernames ) ) {
             for ( $i = 0, $count = count( $recipient_usernames ); $i < $count; ++$i ) {
-                if ( $rid = bp_core_get_userid( trim($recipient_usernames[$i]) ) )
+                if ( $rid = bp_core_get_userid( trim($recipient_usernames[$i]) ) ) {
                     $recipient_ids[] = $rid;
+                }
             }
         }
@@ -376 +378 @@
     var $is_active;
 
-    function bp_messages_notice( $id = null ) {
-        $this->__construct($id);
-    }
-
     function __construct( $id = null ) {
         if ( $id ) {
@@ -480 +478 @@
     }
 }
+
 ?>