From 65e2e95e38d5019fe1846329b791ba47129fa3a4 Mon Sep 17 00:00:00 2001
From: Alexander Agnarson <alexander.agnarson@gmail.com>
Date: Fri, 14 Sep 2018 17:52:25 +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 ac9f196..afb4493 100644
--- a/functions/theme-options.php
+++ b/functions/theme-options.php
@@ -86,24 +86,6 @@ Kirki::add_field( 'blogrow_theme', array(
 	'section'		=> 'general',
 	'default'		=> 'on',
 ) );
-// General: Post Comments
-Kirki::add_field( 'blogrow_theme', array(
-	'type'			=> 'switch',
-	'settings'		=> 'post-comments',
-	'label'			=> esc_html__( 'Post Comments', 'blogrow' ),
-	'description'	=> esc_html__( 'Comments on posts', 'blogrow' ),
-	'section'		=> 'general',
-	'default'		=> 'on',
-) );
-// General: Page Comments
-Kirki::add_field( 'blogrow_theme', array(
-	'type'			=> 'switch',
-	'settings'		=> 'page-comments',
-	'label'			=> esc_html__( 'Page Comments', 'blogrow' ),
-	'description'	=> esc_html__( 'Comments on pages', 'blogrow' ),
-	'section'		=> 'general',
-	'default'		=> 'off',
-) );
 // General: Recommended Plugins
 Kirki::add_field( 'blogrow_theme', array(
 	'type'			=> 'switch',
diff --git a/page-templates/child-menu.php b/page-templates/child-menu.php
index db4ef8b..2e24405 100644
--- a/page-templates/child-menu.php
+++ b/page-templates/child-menu.php
@@ -25,7 +25,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 9c2feaa..b65753e 100644
--- a/page.php
+++ b/page.php
@@ -20,7 +20,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 04b9bf9..0d2e90b 100644
--- a/single.php
+++ b/single.php
@@ -47,7 +47,7 @@
 				</div><!--/.boxed-->
 				
 				<div class="boxed pad">
-					<?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-->
 				
 			<?php endwhile; ?>