Removed no comment notice when closed and empty.

aldopinga · Mar 1, 2016 · cb8e62e · cb8e62e
1 parent 3b0abe6
commit cb8e62e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/render/template-parts.php b/lib/render/template-parts.php
@@ -111,7 +111,7 @@ function beans_comments_template() {
 
 	global $post;
 
-	if ( !post_type_supports( beans_get( 'post_type', $post ), 'comments' ) )
+	if ( !( comments_open() || get_comments_number() ) || !post_type_supports( beans_get( 'post_type', $post ), 'comments' ) )
 		return;
 
 	comments_template();

diff --git a/lib/templates/structure/comments.php b/lib/templates/structure/comments.php
@@ -13,7 +13,7 @@
 
 echo beans_open_markup( 'beans_comments', 'div', array( 'id' => 'comments', 'class' => 'tm-comments' . ( current_theme_supports( 'beans-default-styling' ) ? ' uk-panel-box' : null ) ) );
 
-	if ( comments_open( get_the_ID() ) ) :
+	if ( comments_open() || get_comments_number() ) :
 
 		if ( have_comments() ) :
 
@@ -48,7 +48,9 @@
 		 */
 		do_action( 'beans_after_open_comments' );
 
-	else :
+	endif;
+
+	if ( !comments_open() ) :
 
 		/**
 		 * Fires if comments are closed.