Ticket #4597: 4597.diff

bp-messages/bp-messages-classes.php

@@ -365 +365 @@
                 if ( !$wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_messages} ( thread_id, sender_id, subject, message, date_sent ) VALUES ( %d, %d, %s, %s, %s )", $this->thread_id, $this->sender_id, $this->subject, $this->message, $this->date_sent ) ) )
                         return false;
 
+                $this->id = $wpdb->insert_id;
+
                 $recipient_ids = array();
 
                 if ( $new_thread ) {
@@ -382 +384 @@
                         $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = unread_count + 1, sender_only = 0, is_deleted = 0 WHERE thread_id = %d AND user_id != %d", $this->thread_id, $this->sender_id ) );
                 }
 
-                $this->id = $wpdb->insert_id;
                 messages_remove_callback_values();
 
                 do_action_ref_array( 'messages_message_after_save', array( &$this ) );