Changeset 2450

Timestamp:

01/25/2010 02:48:13 PM (14 years ago)

Author:

apeatling

Message:

Fixes #1686

Location:

trunk

Files:

• bp-messages.php (modified) (2 diffs)
• bp-messages/bp-messages-classes.php (modified) (1 diff)
• bp-messages/bp-messages-notifications.php (modified) (2 diffs)
• bp-themes/bp-default/sidebar.php (modified) (1 diff)

trunk/bp-messages.php

@@ -453 +453 @@
             return false;
 
-        $message->recipients = $recipient_ids;
+        /* Format this to match existing recipients */
+        foreach( $recipient_ids as $i => $recipient_id ) {
+            $message->recipients[$i] = new stdClass;
+            $message->recipients[$i]->user_id = $recipient_id;
+        }
     }
 
@@ -464 +468 @@
 
         // Send email notifications to the recipients
-        messages_notification_new_message( array( 'item_id' => $message->id, 'recipient_ids' => $message->recipients, 'thread_id' => $message->thread_id, 'component_name' => $bp->messages->slug, 'component_action' => 'message_sent', 'is_private' => 1 ) );
+        messages_notification_new_message( array( 'message_id' => $message->id, 'sender_id' => $message->sender_id, 'subject' => $message->subject, 'content' => $message->message, 'recipients' => $message->recipients, 'thread_id' => $message->thread_id) );
 
         do_action( 'messages_message_sent', &$message );

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

@@ -295 +295 @@
             /* Add an recipient entry for all recipients */
             foreach ( (array)$this->recipients as $recipient )
-                $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_recipients} ( user_id, thread_id, unread_count ) VALUES ( %d, %d, 1 )", $recipient, $this->thread_id ) );
+                $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_recipients} ( user_id, thread_id, unread_count ) VALUES ( %d, %d, 1 )", $recipient->user_id, $this->thread_id ) );
 
             /* Add a sender recipient entry if the sender is not in the list of recipients */

trunk/bp-messages/bp-messages-notifications.php

@@ -5 +5 @@
     extract($args);
 
-    $message = new BP_Messages_Message( $item_id );
-
-    $sender_name = bp_core_get_user_displayname( $message->sender_id );
+    $sender_name = bp_core_get_user_displayname( $sender_id );
 
     for ( $i = 0; $i < count($recipients); $i++ ) {
-        if ( $message->sender_id == $recipients[$i]->user_id || 'no' == get_usermeta( $recipients[$i]->user_id, 'notification_messages_new_message' ) ) continue;
+        if ( $sender_id == $recipients[$i]->user_id || 'no' == get_usermeta( $recipients[$i]->user_id, 'notification_messages_new_message' ) ) continue;
 
         $ud = get_userdata( $recipients[$i]->user_id );
-        $message_link = bp_core_get_user_domain( $recipients[$i]->user_id ) . 'messages/view/' . $message->id;
+        $message_link = bp_core_get_user_domain( $recipients[$i]->user_id ) . 'messages/view/' . $message_id;
         $settings_link = bp_core_get_user_domain( $recipients[$i]->user_id ) . 'settings/notifications';
 
         // Set up and send the message
         $to = $ud->user_email;
-        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), stripslashes( $sender_name ) );
+        $email_subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), stripslashes( $sender_name ) );
 
-        $content = sprintf( __(
+        $email_content = sprintf( __(
 '%s sent you a new message:
 
@@ -30 +28 @@
 
 ---------------------
-', 'buddypress' ), $sender_name, stripslashes( wp_filter_kses( $message->subject ) ), stripslashes( wp_filter_kses( $message->message ) ), $message_link );
+', 'buddypress' ), $sender_name, stripslashes( wp_filter_kses( $subject ) ), stripslashes( wp_filter_kses( $content ) ), $message_link );
 
         $content .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
 
         // Send it
-        wp_mail( $to, $subject, $content );
+        wp_mail( $to, $email_subject, $email_content );
     }
 }
-
 
 /* This is too expensive to send on normal servers uncomment action at your own risk. */

trunk/bp-themes/bp-default/sidebar.php

@@ -9 +9 @@
 
         <div id="sidebar-me">
-            <a href="<?php echo bp_loggedin_user_domain() ?>" title="<?php _e( 'My Profile', 'buddypress' ) ?>">
+            <a href="<?php echo bp_loggedin_user_domain() ?>">
                 <?php bp_loggedin_user_avatar( 'type=thumb&width=40&height=40' ) ?>
             </a>