Ticket #17568: 17568-simplify-with-attachment-comments.diff

wp-content/themes/twentyeleven/comments.php

@@ -63 +63 @@
                 </nav>
                 <?php endif; // check for comment navigation ?>
 
-        <?php else : // this is displayed if there are no comments so far ?>
-
-                <?php if ( comments_open() ) : // If comments are open, but there are no comments ?>
-
-                <?php else : // or, if we don't have comments:
-
-                        /* If there are no comments and comments are closed,
-                         * let's leave a little note, shall we?
-                         * But only on posts! We don't want the note on pages.
-                         */
-                        if ( ! comments_open() && ! is_page() ) :
-                        ?>
-                        <p class="nocomments"><?php _e( 'Comments are closed.', 'twentyeleven' ); ?></p>
-                        <?php endif; // end ! comments_open() && ! is_page() ?>
-
-
-                <?php endif; ?>
-
+        <?php 
+                /* If there are no comments and comments are closed, let's leave a little note, shall we?
+                 * But we don't want the note on pages or post types that do not support comments.
+                 */
+                elseif ( ! comments_open() && ! is_page() && post_type_supports( get_post_type(), 'comments' ) ) :
+        ?>
+                <p class="nocomments"><?php _e( 'Comments are closed.', 'twentyeleven' ); ?></p>
         <?php endif; ?>
 
         <?php comment_form(); ?>

wp-includes/post.php

@@ -55 +55 @@
                 'rewrite' => false,
                 'query_var' => false,
                 'show_in_nav_menus' => false,
+                'supports' => array( 'comments' ),
         ) );
 
         register_post_type( 'revision', array(