Ticket #7329: 7329.patch

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

@@ -2234 +2234 @@
 function bp_activity_comment_depth() {
         echo bp_activity_get_comment_depth();
 }
+
         /**
          * Return the current activity comment depth.
          *
          * @since 2.0.0
          *
+         * @param null|BP_Activity_Activity $comment
+         *
          * @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 ( ! empty( $comment->depth ) ) {
+                        $depth = $comment->depth;
+                } elseif ( ! empty( $activities_template->activity->current_comment->depth ) ) {
+                        $depth = $activities_template->activity->current_comment->depth;
+                }
+
                 /**
                  * Filters the comment depth of the current activity comment.
                  *
@@ -2251 +2262 @@
                  *
                  * @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

@@ -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;
                 }
         }