Changeset 8099

Timestamp:

03/09/2014 07:46:01 PM (11 years ago)

Author:

boonebgorges

Message:

When a message is deleted, delete corresponding notifications

Fixes #5289

Props imath, henrywright

Location:

trunk

Files:

• bp-messages/bp-messages-classes.php (modified) (2 diffs)
• bp-messages/bp-messages-notifications.php (modified) (1 diff)
• tests/testcases/messages/notifications.php (added)

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

@@ -213 +213 @@
         $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 ) );
+
         // Check to see if any more recipients remain for this message
         // if not, then delete the message from the database.
@@ -224 +227 @@
             $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d", $thread_id ) );
         }
+
+        do_action( 'messages_thread_deleted_thread', $message_id );
 
         return true;

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

@@ -190 +190 @@
 }
 add_action( 'messages_screen_conversation', 'bp_messages_screen_inbox_mark_notifications', 10 );
+
+/**
+ * When a message is deleted, delete corresponding notifications.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param int $message_id ID of the message.
+ */
+function bp_messages_message_delete_notifications( $message_id = 0 ) {
+    if ( bp_is_active( 'notifications' ) && ! empty( $message_id ) ) {
+        bp_notifications_delete_notifications_by_item_id( bp_loggedin_user_id(), (int) $message_id, buddypress()->messages->id, 'new_message' );
+    }
+}
+add_action( 'messages_thread_deleted_thread', 'bp_messages_message_delete_notifications', 10, 1 );