Ticket #7329: 7329.02.patch

src/bp-activity/bp-activity-template.php

@@ -2230 +2230 @@
  * Output the depth of the current activity comment.
  *
  * @since 2.0.0
+ *
+ * @param object|null $comment Object of the activity comment. Usually unnecessary when used in activity
+ *                             comment loop.
  */
-function bp_activity_comment_depth() {
-        echo bp_activity_get_comment_depth();
+function bp_activity_comment_depth( $comment = null ) {
+        echo bp_activity_get_comment_depth( $comment );
 }
+
         /**
          * Return the current activity comment depth.
          *
          * @since 2.0.0
          *
-         * @return int $depth Depth for the current activity comment.
+         * @param  object|null $comment Object of the activity comment. Usually unnecessary when used in
+         *                              activity comment loop.
+         * @return int         $depth   Depth for the current activity comment.
          */
-        function bp_activity_get_comment_depth() {
+        function bp_activity_get_comment_depth( $comment = null ) {
                 global $activities_template;
 
+                $depth = 1;
+                if ( isset( $activities_template->activity->current_comment->depth ) ) {
+                        $depth = $activities_template->activity->current_comment->depth;
+                } elseif ( ! empty( $comment->id ) ) {
+                        // Fetch the entire root comment tree... ugh.
+                        $comments = BP_Activity_Activity::get_activity_comments( $comment->item_id, 1, constant( 'PHP_INT_MAX' ) );
+
+                        // Recursively find our comment object from the comment tree.
+                        $iterator  = new RecursiveArrayIterator( $comments );
+                        $recursive = new RecursiveIteratorIterator( $iterator, RecursiveIteratorIterator::SELF_FIRST );
+                        foreach ( $recursive as $cid => $cobj ) {
+                                // We found the activity comment! Set the depth.
+                                if ( $cid === $comment->id && isset( $cobj->depth ) ) {
+                                        $depth = $cobj->depth;
+
+                                        /*
+                                         * Here, we're iterating the depth to anticipate the next comment.
+                                         *
+                                         * We're doing this because:
+                                         * - We're (probably) displaying activity comments in stream mode.
+                                         * - We need to iterate so bp_blogs_can_comment_reply() knows how to
+                                         *   disable replies for activity comments.
+                                         */
+                                        ++$depth;
+
+                                        break;
+                                }
+                        }
+                }
+
                 /**
                  * Filters the comment depth of the current activity comment.
                  *
@@ -2251 +2287 @@
                  *
                  * @param int $depth Depth for the current activity comment.
                  */
-                return apply_filters( 'bp_activity_get_comment_depth', $activities_template->activity->current_comment->depth );
+                return apply_filters( 'bp_activity_get_comment_depth', $depth );
         }
 
 /**

src/bp-blogs/bp-blogs-activity.php

@@ -1147 +1147 @@
         }
 
         $allow_comments = bp_blogs_comments_open( $activity );
-        $thread_depth   = bp_blogs_get_blogmeta( $activity->item_id, 'thread_comments_depth' );
+        $thread_depth   = (int) bp_blogs_get_blogmeta( $activity->item_id, 'thread_comments_depth' );
 
         // Initialize a local object so we won't have to query this again in the
         // comment loop.
@@ -1299 +1299 @@
         }
 
         // Check comment depth and disable if depth is too large.
-        if ( isset( buddypress()->blogs->thread_depth[$comment->item_id] ) ){
-                if ( bp_activity_get_comment_depth() > buddypress()->blogs->thread_depth[$comment->item_id] ) {
+        if ( isset( buddypress()->blogs->thread_depth[ $comment->item_id ] ) ) {
+                if ( bp_activity_get_comment_depth( $comment ) > buddypress()->blogs->thread_depth[ $comment->item_id ] ) {
                         $retval = false;
                 }
         }
 
         // Check if we should disable activity replies based on the parent activity.
-        if ( isset( buddypress()->blogs->allow_comments[$comment->item_id] ) ){
+        if ( isset( buddypress()->blogs->allow_comments[ $comment->item_id ] ) ) {
                 // The blog post has closed off commenting, so we should disable all activity
                 // comments under the parent 'new_blog_post' activity entry.
-                if ( empty( buddypress()->blogs->allow_comments[$comment->item_id] ) ) {
+                if ( empty( buddypress()->blogs->allow_comments[ $comment->item_id ] ) ) {
                         $retval = false;
                 }
         }