Changeset 6591

Timestamp:

12/10/2012 10:25:25 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Fix logic in get_activity_comments():

• Use more accurate bounds when comparing mptt_left.
• Fixes bug where activity comments would not appear on user profile pages where child comments exist in a hierarchical stream.
• Fixes bug with spam SQL variable in same query.
• Props sboisvert.
• Fixes #4600.

File:

• trunk/bp-activity/bp-activity-classes.php (modified) (1 diff)

trunk/bp-activity/bp-activity-classes.php

@@ -500 +500 @@
 
             // Don't retrieve activity comments marked as spam
-            if ( 'ham_only' == $spam )
+            if ( 'ham_only' == $spam ) {
                 $spam_sql = 'AND a.is_spam = 0';
-            elseif ( 'spam_only' == $spam )
+            } elseif ( 'spam_only' == $spam ) {
                 $spam_sql = 'AND a.is_spam = 1';
-            else
+            } else {
                 $spam_sql = '';
+            }
 
             // The mptt BETWEEN clause allows us to limit returned descendants to the right part of the tree
-            $sql = apply_filters( 'bp_activity_comments_user_join_filter', $wpdb->prepare( "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name{$fullname_select} FROM {$bp->activity->table_name} a, {$wpdb->users} u{$fullname_from} WHERE u.ID = a.user_id {$fullname_where} AND a.type = 'activity_comment' ${spam_sql} AND a.item_id = %d AND a.mptt_left BETWEEN %d AND %d ORDER BY a.date_recorded ASC", $top_level_parent_id, $left, $right ), $activity_id, $left, $right, $spam_sql );
+            $sql = apply_filters( 'bp_activity_comments_user_join_filter', $wpdb->prepare( "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name{$fullname_select} FROM {$bp->activity->table_name} a, {$wpdb->users} u{$fullname_from} WHERE u.ID = a.user_id {$fullname_where} AND a.type = 'activity_comment' {$spam_sql} AND a.item_id = %d AND a.mptt_left > %d AND a.mptt_left < %d ORDER BY a.date_recorded ASC", $top_level_parent_id, $left, $right ), $activity_id, $left, $right, $spam_sql );
 
             // Retrieve all descendants of the $root node