Changeset 9951 for trunk/src/bp-messages/classes/class-bp-messages-thread.php

Timestamp:

06/16/2015 10:59:18 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Messages: Modify message thread queries to exclude messages in deleted threads from "Starred" messages.

This change ensures that deleted messages do not appear in the "Starred" section of a member's private messages. Previously, it was possible to delete a private message thread, and still have it come back to life in the "Starred" messages section.

Fixes #6483. Props r-a-y. (trunk, for 2.4.0)

File:

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

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

@@ -463 +463 @@
         $r['user_id'] = (int) $r['user_id'];
 
+        // Default deleted SQL
+        $deleted_sql = 'r.is_deleted = 0';
+
         switch ( $r['box'] ) {
             case 'sentbox' :
@@ -470 +473 @@
 
             case 'inbox' :
-            default :
                 $user_id_sql = 'AND ' . $wpdb->prepare( 'r.user_id = %d', $r['user_id'] );
                 $sender_sql  = 'AND r.sender_only = 0';
+                break;
+
+            default :
+                // Omit user-deleted threads from all other custom message boxes
+                $deleted_sql = $wpdb->prepare( '( r.user_id = %d AND r.is_deleted = 0 )', $r['user_id'] );
                 break;
         }
@@ -491 +498 @@
         $sql['select'] = 'SELECT m.thread_id, MAX(m.date_sent) AS date_sent';
         $sql['from']   = "FROM {$bp->messages->table_name_recipients} r INNER JOIN {$bp->messages->table_name_messages} m ON m.thread_id = r.thread_id {$meta_query_sql['join']}";
-        $sql['where']  = "WHERE r.is_deleted = 0 {$user_id_sql} {$sender_sql} {$type_sql} {$search_sql} {$meta_query_sql['where']}";
+        $sql['where']  = "WHERE {$deleted_sql} {$user_id_sql} {$sender_sql} {$type_sql} {$search_sql} {$meta_query_sql['where']}";
         $sql['misc']   = "GROUP BY m.thread_id ORDER BY date_sent DESC {$pag_sql}";