From d0c639ccf0cc7dba6e1bacf876e49c6ba5af05e5 Mon Sep 17 00:00:00 2001
From: Alexander Agnarson <alexander.agnarson@gmail.com>
Date: Fri, 14 Sep 2018 17:46:44 +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 9d8a9db..6a8d5e7 100644
--- a/functions/theme-options.php
+++ b/functions/theme-options.php
@@ -87,24 +87,6 @@ Kirki::add_field( 'typecore_theme', array(
 		's1-s2'		=> esc_html__( 'Hide both sidebars', 'typecore' ),
 	),
 ) );
-// General: Post Comments
-Kirki::add_field( 'typecore_theme', array(
-	'type'			=> 'switch',
-	'settings'		=> 'post-comments',
-	'label'			=> esc_html__( 'Post Comments', 'typecore' ),
-	'description'	=> esc_html__( 'Comments on posts', 'typecore' ),
-	'section'		=> 'general',
-	'default'		=> 'on',
-) );
-// General: Page Comments
-Kirki::add_field( 'typecore_theme', array(
-	'type'			=> 'switch',
-	'settings'		=> 'page-comments',
-	'label'			=> esc_html__( 'Page Comments', 'typecore' ),
-	'description'	=> esc_html__( 'Comments on pages', 'typecore' ),
-	'section'		=> 'general',
-	'default'		=> 'off',
-) );
 // General: Recommended Plugins
 Kirki::add_field( 'typecore_theme', array(
 	'type'			=> 'switch',
diff --git a/page-templates/child-menu.php b/page-templates/child-menu.php
index 1df1b6e..d99809f 100644
--- a/page-templates/child-menu.php
+++ b/page-templates/child-menu.php
@@ -24,7 +24,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 7e51ac4..4ea60fa 100644
--- a/page.php
+++ b/page.php
@@ -19,7 +19,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 abebb29..9ebc401 100644
--- a/single.php
+++ b/single.php
@@ -47,7 +47,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-->