Changeset 6256

Timestamp:

08/14/2012 08:49:51 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Comments:

• Clean up comments.php
• Bail early if post type does not support comments.
• Improves handling of comments and form when not supported, or have no reason to appear.

File:

• trunk/bp-themes/bp-default/comments.php (modified) (3 diffs)

trunk/bp-themes/bp-default/comments.php

@@ -1 +1 @@
 <?php
+
+    // Bail if post type doesn't support comments
+    if ( ! post_type_supports( get_post_type(), 'comments' ) )
+        return;
+
+    // Bail if is a page, and comments are not open
+    if ( is_page() && ! have_comments() && ! comments_open() && ! pings_open() )
+        return;
+
     if ( post_password_required() ) {
         echo '<h3 class="comments-header">' . __( 'Password Protected', 'buddypress' ) . '</h3>';
@@ -6 +15 @@
     }
 
-    if ( is_page() && !have_comments() && !comments_open() && !pings_open() )
-        return;
-
     if ( have_comments() ) :
-        $num_comments = 0;
+        $num_comments   = 0;
         $num_trackbacks = 0;
         foreach ( (array) $comments as $comment ) {
-            if ( 'comment' != get_comment_type() )
+            if ( 'comment' != get_comment_type() ) {
                 $num_trackbacks++;
-            else
+            } else {
                 $num_comments++;
+            }
         }
 ?>
@@ -40 +47 @@
 
     </div><!-- #comments -->
+
 <?php else : ?>
 
-    <?php if ( pings_open() && !comments_open() && ( is_single() || is_page() ) ) : ?>
-        <p class="comments-closed pings-open">
-            <?php printf( __( 'Comments are closed, but <a href="%1$s" title="Trackback URL for this post">trackbacks</a> and pingbacks are open.', 'buddypress' ), trackback_url( '0' ) ); ?>
-        </p>
-    <?php elseif ( !comments_open() && ( is_single() || is_page() ) ) : ?>
-        <p class="comments-closed">
-            <?php _e( 'Comments are closed.', 'buddypress' ); ?>
-        </p>
+    <?php if ( ! comments_open() ) : ?>
+        <?php if ( pings_open() ) : ?>
+            <p class="comments-closed pings-open">
+                <?php printf( __( 'Comments are closed, but <a href="%1$s" title="Trackback URL for this post">trackbacks</a> and pingbacks are open.', 'buddypress' ), trackback_url( '0' ) ); ?>
+            </p>
+        <?php else : ?>
+            <p class="comments-closed">
+                <?php _e( 'Comments are closed.', 'buddypress' ); ?>
+            </p>
+        <?php endif; ?>
     <?php endif; ?>
 
 <?php endif; ?>
 
-<?php if ( comments_open() ) : ?>
-    <?php comment_form(); ?>
-<?php endif; ?>
+<?php if ( comments_open() ) comment_form(); ?>
 
 <?php if ( !empty( $num_trackbacks ) ) : ?>