Ticket #5567: 5567.02.diff

entry.php

@@ -85 +85 @@
 
         <?php do_action( 'bp_before_activity_entry_comments' ); ?>
 
-        <?php if ( ( is_user_logged_in() && bp_activity_can_comment() ) || bp_is_single_activity() ) : ?>
+        <?php if ( ( bp_activity_get_comment_count() || bp_activity_can_comment() ) || bp_is_single_activity() ) : ?>
 
                 <div class="activity-comments">
 
                         <?php bp_activity_comments(); ?>
 
-                        <?php if ( is_user_logged_in() ) : ?>
+                        <?php if ( is_user_logged_in() && bp_activity_can_comment() ) : ?>
 
                                 <form action="<?php bp_activity_comment_form_action(); ?>" method="post" id="ac-form-<?php bp_activity_id(); ?>" class="ac-form"<?php bp_activity_comment_form_nojs_display(); ?>>
                                         <div class="ac-reply-avatar"><?php bp_loggedin_user_avatar( 'width=' . BP_AVATAR_THUMB_WIDTH . '&height=' . BP_AVATAR_THUMB_HEIGHT ); ?></div>