From b0c90ca319680a40ece337e8b0a86ca73699491c Mon Sep 17 00:00:00 2001
From: Alexander Agnarson <alexander.agnarson@gmail.com>
Date: Fri, 20 Jul 2018 17:47:43 +0200
Subject: [PATCH] Page/post comments options removed as it is already in core

---
 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 0b10d67..11c784f 100644
--- a/functions/theme-options.php
+++ b/functions/theme-options.php
@@ -99,24 +99,6 @@
 	'section'		=> 'general',
 	'default'		=> 'on',
 ) );
-// General: Post Comments
-Kirki::add_field( 'slanted_theme', array(
-	'type'			=> 'switch',
-	'settings'		=> 'post-comments',
-	'label'			=> esc_attr__( 'Post Comments', 'slanted' ),
-	'description'	=> esc_attr__( 'Comments on posts', 'slanted' ),
-	'section'		=> 'general',
-	'default'		=> 'on',
-) );
-// General: Page Comments
-Kirki::add_field( 'slanted_theme', array(
-	'type'			=> 'switch',
-	'settings'		=> 'page-comments',
-	'label'			=> esc_attr__( 'Page Comments', 'slanted' ),
-	'description'	=> esc_attr__( 'Comments on pages', 'slanted' ),
-	'section'		=> 'general',
-	'default'		=> 'off',
-) );
 // General: Recommended Plugins
 Kirki::add_field( 'slanted_theme', array(
 	'type'			=> 'switch',
diff --git a/page-templates/child-menu.php b/page-templates/child-menu.php
index d563587..2ad317b 100644
--- a/page-templates/child-menu.php
+++ b/page-templates/child-menu.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/page.php b/page.php
index d7d402f..bb5ac36 100644
--- a/page.php
+++ b/page.php
@@ -14,7 +14,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 1159bb8..56955e1 100644
--- a/single.php
+++ b/single.php
@@ -42,7 +42,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-->