From ca58fbc22d210d0c71d9155ed83ae4c808be2c42 Mon Sep 17 00:00:00 2001
From: Lance Willett <lancewillett@git.wordpress.org>
Date: Fri, 16 Nov 2012 21:35:42 +0000
Subject: [PATCH] Twenty Ten: move the "Comments closed" text outside the
 `have_comments()` conditional, props kovshenin. Closes #20469.

git-svn-id: https://develop.svn.wordpress.org/trunk@22617 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-content/themes/twentyten/comments.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/wp-content/themes/twentyten/comments.php b/wp-content/themes/twentyten/comments.php
index eece437d69..7b13d00430 100644
--- a/wp-content/themes/twentyten/comments.php
+++ b/wp-content/themes/twentyten/comments.php
@@ -62,15 +62,13 @@
 			</div><!-- .navigation -->
 <?php endif; // check for comment navigation ?>
 
-<?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?
-	 */
-	if ( ! comments_open() ) :
-?>
-	<p class="nocomments"><?php _e( 'Comments are closed.', 'twentyten' ); ?></p>
-<?php endif; // end ! comments_open() ?>
+<?php
+/* 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.
+ */
+if ( ! comments_open() && get_comments_number() ) : ?>
+	<p class="nocomments"><?php _e( 'Comments are closed.' , 'twentyten' ); ?></p>
+<?php endif; // end ! comments_open ?>
 
 <?php endif; // end have_comments() ?>