Changeset 9184

Timestamp:

11/26/2014 06:08:39 AM (10 years ago)

Author:

r-a-y

Message:

Grab all message IDs before deleting a message thread.

In BP_Messages_Thread::delete(), we need to grab all message IDs before
a message thread is outright deleted. This is done by using
$wpdb->get_col() instead of $wpdb->get_var().

This commit also:

• Deletes the message meta attached to the message (see #3083)
• Reinstates the 'messages_thread_deleted_hook' action that was improperly removed in r9165
• Adds $message_ids as an extra parameter to the 'bp_messages_thread_after_delete' action

File:

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

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

@@ -255 +255 @@
         $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() ) );
 
-        // Get the message id in order to pass to the action
-        $message_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_messages} WHERE thread_id = %d", $thread_id ) );
+        // Get the message ids in order to pass to the action
+        $message_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_messages} WHERE thread_id = %d", $thread_id ) );
 
         // Check to see if any more recipients remain for this message
@@ -266 +266 @@
             $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->messages->table_name_messages} WHERE thread_id = %d", $thread_id ) );
 
+            // Do something for each message ID
+            foreach ( $message_ids as $message_id ) {
+                // Delete message meta
+                bp_messages_delete_meta( $message_id );
+
+                /**
+                 * Fires after a message is deleted. This hook is poorly named.
+                 *
+                 * @since BuddyPress (1.0.0)
+                 *
+                 * @param int $message_id ID of the message
+                 */
+                do_action( 'messages_thread_deleted_thread', $message_id );
+            }
+
             // Delete all the recipients
             $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d", $thread_id ) );
@@ -271 +286 @@
 
         /**
-         * Fires after a message thread is deleted.
+         * Fires after a message thread is either marked as deleted or deleted
          *
          * @since BuddyPress (2.2.0)
          *
-         * @param int $thread_id ID of the thread being deleted.
+         * @param int   $thread_id   ID of the thread being deleted.
+         * @param array $message_ids IDs of messages being deleted.
          */
-        do_action( 'bp_messages_thread_after_delete', $message_id );
+        do_action( 'bp_messages_thread_after_delete', $thread_id, $message_ids );
 
         return true;