From 13cb0aa9a38a1585b9761a0003b044c2f5ed686b Mon Sep 17 00:00:00 2001
From: Lance Willett <lancewillett@git.wordpress.org>
Date: Fri, 16 Nov 2012 21:28:47 +0000
Subject: [PATCH] Twenty Twelve: better fix for #20469 and comments closed
 messages, also load the comments template in single.php template regardless
 of whether comments are open or closed (consistent with page.php). Both props
 kovshenin.

git-svn-id: https://develop.svn.wordpress.org/trunk@22615 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-content/themes/twentytwelve/comments.php | 2 +-
 wp-content/themes/twentytwelve/single.php   | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/wp-content/themes/twentytwelve/comments.php b/wp-content/themes/twentytwelve/comments.php
index 1797d193bd..c43101358d 100644
--- a/wp-content/themes/twentytwelve/comments.php
+++ b/wp-content/themes/twentytwelve/comments.php
@@ -49,7 +49,7 @@ if ( post_password_required() )
 		/* If there are no comments and comments are closed, let's leave a note.
 		 * But we only want the note on posts and pages that had comments in the first place.
 		 */
-		if ( ! comments_open() && ! empty( $comments_by_type['comment'] ) ) : ?>
+		if ( ! comments_open() && get_comments_number() ) : ?>
 		<!-- If comments are closed. -->
 		<p class="nocomments"><?php _e( 'Comments are closed.' , 'twentytwelve' ); ?></p>
 		<?php endif; ?>
diff --git a/wp-content/themes/twentytwelve/single.php b/wp-content/themes/twentytwelve/single.php
index 8dedbfc206..38a813bc04 100644
--- a/wp-content/themes/twentytwelve/single.php
+++ b/wp-content/themes/twentytwelve/single.php
@@ -22,11 +22,7 @@ get_header(); ?>
 					<span class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '&rarr;', 'Next post link', 'twentytwelve' ) . '</span>' ); ?></span>
 				</nav><!-- .nav-single -->
 
-				<?php
-					// If comments are open or we have at least one comment, load up the comment template
-					if ( comments_open() || '0' != get_comments_number() )
-						comments_template( '', true );
-				?>
+				<?php comments_template( '', true ); ?>
 
 			<?php endwhile; // end of the loop. ?>