Changeset 6410

Timestamp:

10/15/2012 07:09:43 PM (14 years ago)

Author:

boonebgorges

Message:

Ensure that BP_Activity_Activity::get() pulls up comments for non-top-level items

There was previously an exception in BP_Activity_Activity::append_comments()
that would make it impossible to load activity comments for activity items
that were themselves activity comments. This changeset removes the restriction,
and adds the necessary top_level_parent_id parameter to the get_comments()
method so that the comment tree is pulled up correctly in all cases.

Fixes #4600

Props sboisvert

File:

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

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

@@ -453 +453 @@
                 $activity_comments = array();
 
-                /* Now fetch the activity comments and parse them into the correct position in the activities array. */
+                // Now fetch the activity comments and parse them into the correct position in the activities array.
                 foreach( (array) $activities as $activity ) {
-                        if ( 'activity_comment' != $activity->type && $activity->mptt_left && $activity->mptt_right )
-                                $activity_comments[$activity->id] = BP_Activity_Activity::get_activity_comments( $activity->id, $activity->mptt_left, $activity->mptt_right, $spam );
-                }
-
-                /* Merge the comments with the activity items */
+                        $top_level_parent_id = 'activity_comment' == $activity->type ? $activity->item_id : 0;
+                        $activity_comments[$activity->id] = BP_Activity_Activity::get_activity_comments( $activity->id, $activity->mptt_left, $activity->mptt_right, $spam );
+                }
+
+                // Merge the comments with the activity items
                 foreach( (array) $activities as $key => $activity )
                         if ( isset( $activity_comments[$activity->id] ) )
@@ -476 +476 @@
          * @param into $right Right-most node boundary
          * @param bool $spam Optional; 'ham_only' (default), 'spam_only' or 'all'.
+         * @param int $top_level_parent_id The id of the root-level parent activity item
          * @return array The updated activities with nested comments
          * @since BuddyPress (1.2)
          */
-        function get_activity_comments( $activity_id, $left, $right, $spam = 'ham_only' ) {
-                global $wpdb, $bp;
+        function get_activity_comments( $activity_id, $left, $right, $spam = 'ham_only', $top_level_parent_id = 0 ) {
+                global $wpdb, $bp;
+
+                if ( empty( $top_level_parent_id ) ) {
+                        $top_level_parent_id = $activity_id;
+                }
 
                 if ( !$comments = wp_cache_get( 'bp_activity_comments_' . $activity_id ) ) {
@@ -502 +507 @@
                                 $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 BETWEEN %d AND %d ORDER BY a.date_recorded ASC", $activity_id, $left, $right ), $activity_id, $left, $right, $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 );
 
                         // Retrieve all descendants of the $root node