From b1dc15c0d0f634bc3b15541d408b480fa0c636f8 Mon Sep 17 00:00:00 2001
From: Alexander Agnarson <alexander.agnarson@gmail.com>
Date: Fri, 14 Sep 2018 17:53:49 +0200
Subject: [PATCH] Remove global post/page comments settings

---
 functions/theme-options.php   | 18 ------------------
 page-templates/child-menu.php |  2 +-
 page.php                      |  2 +-
 single.php                    |  2 +-
 4 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/functions/theme-options.php b/functions/theme-options.php
index 8179337..54def41 100644
--- a/functions/theme-options.php
+++ b/functions/theme-options.php
@@ -81,24 +81,6 @@ Kirki::add_field( 'blogline_theme', array(
 	'section'		=> 'general',
 	'default'		=> 'on',
 ) );
-// General: Post Comments
-Kirki::add_field( 'blogline_theme', array(
-	'type'			=> 'switch',
-	'settings'		=> 'post-comments',
-	'label'			=> esc_html__( 'Post Comments', 'blogline' ),
-	'description'	=> esc_html__( 'Comments on posts', 'blogline' ),
-	'section'		=> 'general',
-	'default'		=> 'on',
-) );
-// General: Page Comments
-Kirki::add_field( 'blogline_theme', array(
-	'type'			=> 'switch',
-	'settings'		=> 'page-comments',
-	'label'			=> esc_html__( 'Page Comments', 'blogline' ),
-	'description'	=> esc_html__( 'Comments on pages', 'blogline' ),
-	'section'		=> 'general',
-	'default'		=> 'off',
-) );
 // General: Recommended Plugins
 Kirki::add_field( 'blogline_theme', array(
 	'type'			=> 'switch',
diff --git a/page-templates/child-menu.php b/page-templates/child-menu.php
index b78d024..9533732 100644
--- a/page-templates/child-menu.php
+++ b/page-templates/child-menu.php
@@ -22,7 +22,7 @@ Template Name: Child Menu
 				
 			</article>
 			
-			<?php if ( get_theme_mod( 'page-comments', 'off' ) == 'on' ) { comments_template('/comments.php',true); } ?>
+			<?php if ( comments_open() || get_comments_number() ) :	comments_template( '/comments.php', true ); endif; ?>
 			
 		<?php endwhile; ?>
 		
diff --git a/page.php b/page.php
index 695332c..72b3bcf 100644
--- a/page.php
+++ b/page.php
@@ -17,7 +17,7 @@
 				
 			</article>
 			
-			<?php if ( get_theme_mod( 'page-comments', 'off' ) == 'on' ) { comments_template('/comments.php',true); } ?>
+			<?php if ( comments_open() || get_comments_number() ) :	comments_template( '/comments.php', true ); endif; ?>
 			
 		<?php endwhile; ?>
 		
diff --git a/single.php b/single.php
index 46c3f66..318af3c 100644
--- a/single.php
+++ b/single.php
@@ -48,7 +48,7 @@
 		
 		<?php if ( get_theme_mod( 'related-posts', 'categories' ) != 'disable' ) { get_template_part('inc/related-posts'); } ?>
 		
-		<?php if ( get_theme_mod( 'post-comments', 'on' ) == 'on' ) { comments_template('/comments.php',true); } ?>
+		<?php if ( comments_open() || get_comments_number() ) :	comments_template( '/comments.php', true ); endif; ?>
 		
 	</div><!--/.pad-->
 </div><!--/.content-->