Changeset 9961

Timestamp:

06/22/2015 07:17:05 PM (9 years ago)

Author:

r-a-y

Message:

Activity: When calculating the activity comment depth, prevent an infinite loop when the parent activity item is not an activity update.

In #2768, we added the ability to calculate the activity comment depth.
The code at the time was meant to calculate the activity comment depth for
regular activity updates ('activity_update'). However, it is possible
for other activity types to have activity comments attached to them. For
example, since the introduction of comment syncing in 2.0, it is now
possible for activity comments to be attached to 'new_blog_post' items.

When fetching activity comments attached to other activity types (as in the
case when using the "New Comments" activity dropdown filter), an infinite
loop can occur while traversing up the activity tree to calculate the
activity comment depth.

This commit fixes this by checking if the parent activity item is not an
activity update during activity comment depth calculation. If the parent
activity is not an activity update, we have reached the top of the tree can
bail from the recursive depth check.

Fixes #6518.

File:

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

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

@@ -1415 +1415 @@
                 $depth = 1;
                 $parent_id = $r->secondary_item_id;
+
                 while ( $parent_id !== $r->item_id ) {
                     $depth++;
 
-                    // When display_comments=stream, the
-                    // parent comment may not be part of
-                    // the returned results, so we manually
-                    // fetch it
+                    // When display_comments=stream, the parent comment may not be part of the
+                    // returned results, so we manually fetch it
                     if ( empty( $ref[ $parent_id ] ) ) {
                         $direct_parent = new BP_Activity_Activity( $parent_id );
                         if ( isset( $direct_parent->secondary_item_id ) ) {
-                            $parent_id = $direct_parent->secondary_item_id;
+                            // If the direct parent is not an activity update, that means we've reached
+                            // the parent activity item (eg. new_blog_post)
+                            if ( 'activity_update' !== $direct_parent->type ) {
+                                $parent_id = $r->item_id;
+
+                            } else {
+                                $parent_id = $direct_parent->secondary_item_id;
+                            }
+
                         } else {
-                            // Something went wrong
-                            // Short-circuit the
-                            // depth calculation
+                            // Something went wrong.  Short-circuit the depth calculation
                             $parent_id = $r->item_id;
                         }