Ticket #20469: better-comments-notice-20492.diff

wp-content/themes/twentyeleven/comments.php

@@ -63 +63 @@
                 </nav>
                 <?php endif; // check for comment navigation ?>
 
+        <?php endif; // have_comments() ?>
+        
         <?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' ) ) :
+        /* If there are no comments and comments are closed, let's leave a little note, shall we?
+         * But we only want the note on posts and pages that had comments in the first place.
+         * It's just the polite thing to do!
+         */
+        if ( ! comments_open() && '0' != get_comments_number() ) :
         ?>
-                <p class="nocomments"><?php _e( 'Comments are closed.', 'twentyeleven' ); ?></p>
+                <!-- If comments are closed. -->
+                <p class="nocomments"><?php _e( 'Comments are closed.' , 'twentyeleven' ) ?></p>
         <?php endif; ?>
 
         <?php comment_form(); ?>