Ticket #6063: 6063.sql-clauses.patch

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

@@ -380 +380 @@
                         $search_sql        = $wpdb->prepare( "AND ( subject LIKE %s OR message LIKE %s )", $search_terms_like, $search_terms_like );
                 }
 
-                if ( 'sentbox' == $r['box'] ) {
-                        $user_id_sql = $wpdb->prepare( 'm.sender_id = %d', $r['user_id'] );
-                        $thread_ids  = $wpdb->get_results( "SELECT m.thread_id, MAX(m.date_sent) AS date_sent FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND m.sender_id = r.user_id AND {$user_id_sql} AND r.is_deleted = 0 {$search_sql} GROUP BY m.thread_id ORDER BY date_sent DESC {$pag_sql}" );
-                        $total_threads = $wpdb->get_var( "SELECT COUNT( DISTINCT m.thread_id ) FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND m.sender_id = r.user_id AND {$user_id_sql} AND r.is_deleted = 0 {$search_sql} " );
-                } else {
-                        $user_id_sql = $wpdb->prepare( 'r.user_id = %d', $r['user_id'] );
-                        $thread_ids = $wpdb->get_results( "SELECT m.thread_id, MAX(m.date_sent) AS date_sent FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND r.is_deleted = 0 AND {$user_id_sql} AND r.sender_only = 0 {$type_sql} {$search_sql} GROUP BY m.thread_id ORDER BY date_sent DESC {$pag_sql}" );
-                        $total_threads = $wpdb->get_var( "SELECT COUNT( DISTINCT m.thread_id ) FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND r.is_deleted = 0 AND {$user_id_sql} AND r.sender_only = 0 {$type_sql} {$search_sql}" );
+                if ( ! empty( $r['user_id'] ) ) {
+                        if ( 'sentbox' == $r['box'] ) {
+                                $user_id_sql  = 'AND ' . $wpdb->prepare( 'm.sender_id = %d', $r['user_id'] );
+                                $user_id_sql .= ' AND m.sender_id = r.user_id';
+                        } else {
+                                $user_id_sql  = 'AND ' . $wpdb->prepare( 'r.user_id = %d', $r['user_id'] );
+                                $user_id_sql .= ' AND r.sender_only = 0';
+                        }
                 }
 
+                // set up SQL array
+                $sql = array();
+                $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";
+                $sql['where']  = "WHERE m.thread_id = r.thread_id {$user_id_sql} AND r.is_deleted = 0 {$type_sql} {$search_sql}";
+                $sql['misc']   = "GROUP BY m.thread_id ORDER BY date_sent DESC {$pag_sql}";
+
+                // get thread IDs
+                $thread_ids = $wpdb->get_results( implode( ' ', $sql ) );
                 if ( empty( $thread_ids ) ) {
                         return false;
                 }
 
+                // adjust $sql to work for thread total
+                $sql['select'] = 'SELECT COUNT( DISTINCT m.thread_id )';
+                unset( $sql['misc'] );
+                $total_threads = $wpdb->get_var( implode( ' ', $sql ) );
+
                 // Sort threads by date_sent
                 foreach( (array) $thread_ids as $thread ) {
                         $sorted_threads[$thread->thread_id] = strtotime( $thread->date_sent );