Ticket #2768: 2768.patch

bp-activity/bp-activity-templatetags.php

@@ -691 +691 @@
                 return apply_filters( 'bp_activity_get_comments', $comments_html );
         }
                 /* TODO: The HTML in this function is temporary and will be moved to the template in a future version. */
-                function bp_activity_recurse_comments( $comment ) {
+                function bp_activity_recurse_comments( $comment, &$depth=0 ) {
                         global $activities_template, $bp;
 
                         if ( !$comment->children )
@@ -702 +702 @@
                                 if ( !$comment->user_fullname )
                                         $comment->user_fullname = $comment->display_name;
 
+                                $depth++;
                                 $content .= '<li id="acomment-' . $comment->id . '">';
                                 $content .= '<div class="acomment-avatar"><a href="' . bp_core_get_user_domain( $comment->user_id, $comment->user_nicename, $comment->user_login ) . '">' . bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'width' => 20, 'height' => 20, 'email' => $comment->user_email ) ) . '</a></div>';
                                 $content .= '<div class="acomment-meta"><a href="' . bp_core_get_user_domain( $comment->user_id, $comment->user_nicename, $comment->user_login ) . '">' . apply_filters( 'bp_acomment_name', $comment->user_fullname, $comment ) . '</a> &middot; ' . sprintf( __( '%s ago', 'buddypress' ), bp_core_time_since( $comment->date_recorded ) );
 
                                 /* Reply link - the span is so that threaded reply links can be hidden when JS is off. */
-                                if ( is_user_logged_in() && bp_activity_can_comment_reply( $comment ) )
+                                if ( is_user_logged_in() && bp_activity_can_comment_reply( $comment, $depth ) )
                                         $content .= apply_filters( 'bp_activity_comment_reply_link', '<span class="acomment-replylink"> &middot; <a href="#acomment-' . $comment->id . '" class="acomment-reply" id="acomment-reply-' . $activities_template->activity->id . '">' . __( 'Reply', 'buddypress' ) . '</a></span>', $comment );
 
                                 /* Delete link */
@@ -719 +720 @@
                                 $content .= '</div>';
                                 $content .= '<div class="acomment-content">' . apply_filters( 'bp_get_activity_content', $comment->content ) . '</div>';
 
-                                $content .= bp_activity_recurse_comments( $comment );
+                                $content .= bp_activity_recurse_comments( $comment, $depth );
                                 $content .= '</li>';
+
+                                // If we're at the start of an activity loop, we'll be at the start of a new level of items, so reset the depth.
+                                if ( 0 === $activities_template->current_activity )
+                                        $depth = 0;
                         }
+
+                        $depth = 0;
                         $content .= '</ul>';
 
                         return apply_filters( 'bp_activity_recurse_comments', $content );
@@ -952 +959 @@
         return apply_filters( 'bp_activity_can_comment', $can_comment );
 }
 
-function bp_activity_can_comment_reply( $comment ) {
+function bp_activity_can_comment_reply( $comment, $depth ) {
         $can_comment = true;
 
-        return apply_filters( 'bp_activity_can_comment_reply', $can_comment, $comment );
+        if ( get_option( 'thread_comments' ) && $depth >= get_option( 'thread_comments_depth' ) )
+                $can_comment = false;
+
+        return apply_filters( 'bp_activity_can_comment_reply', $can_comment, $comment, $depth );
 }
 
 function bp_activity_can_favorite() {