Changeset 8226

Timestamp:

04/01/2014 12:28:34 AM (11 years ago)

Author:

boonebgorges

Message:

Better checks for existence of parent item when recursing to calculate activity comment depth

The changes introduced in r8201 involve calculating tree depth for each queried
activity comment in a loop. The technique used involves traversing up a tree by
fetching the parent item until the root level is reached. However, the original
technique did not account for the fact that in certain cases - namely, when
display_comments=threaded - it may not be the case that all of the comment
ancestors are available in the current query. This failed logic resulted in
infinite regression in these sorts of cases.

The correction involves performing a separate query for the direct activity
parent when it is not found in the queried items.

Props r-a-y

Fixes #2768

File:

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

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

@@ -1014 +1014 @@
                 while ( $parent_id !== $r->item_id ) {
                     $depth++;
-                    $parent_id = $ref[ $parent_id ]->secondary_item_id;
+
+                    // 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;
+                        } else {
+                            // Something went wrong
+                            // Short-circuit the
+                            // depth calculation
+                            $parent_id = $r->item_id;
+                        }
+                    } else {
+                        $parent_id = $ref[ $parent_id ]->secondary_item_id;
+                    }
                 }
                 $r->depth = $depth;