From 8ba7e351ea082f18af403e74db6918e2b4f4fe32 Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Fri, 6 Nov 2009 14:52:13 -0800
Subject: [PATCH] COMMIT! Fix for the function check_child_theme

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 functions.php      | 15 +++++----------
 layout-head.php    |  4 ----
 sidebar-header.php |  2 ++
 sidebar-right.php  |  3 +--
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/functions.php b/functions.php
index 0862ad0..a264071 100644
--- a/functions.php
+++ b/functions.php
@@ -1,12 +1,5 @@
 <?php
 
-// Run this when a theme is switched to revert the navigation to default
-function comicpress_on_theme_switch() {
-	update_option('comicpress-graphicnav_directory', 'default');
-}
-
-add_action('switch_theme','comicpress_on_theme_switch',1,10);
-
 // Queue up the scripts.
 wp_enqueue_script('comicpress_scroll', get_template_directory_uri() . '/js/scroll.js');
 
@@ -858,9 +851,11 @@ function cp_copyright() {
 
 function comicpress_check_child_file($filename = '') {
 	if (empty($filename)) return false;
-	if (file_exists(get_stylesheet_directory() .'/'. $filename . '.php')) { 
-		@require_once(get_stylesheet_directory() .'/'. $filename . '.php');
-		return true;
+	if (get_stylesheet_directory() != get_template_directory()) {
+		if (file_exists(get_stylesheet_directory() .'/'. $filename . '.php')) { 
+			@require_once(get_stylesheet_directory() .'/'. $filename . '.php');
+			return true;
+		}
 	}
 	return false;
 }
diff --git a/layout-head.php b/layout-head.php
index d670b70..6ea6af0 100644
--- a/layout-head.php
+++ b/layout-head.php
@@ -1,9 +1,5 @@
 <?php if (comicpress_check_child_file('layout-head') == false) { ?>
 
-<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
-	<div id="header-<?php the_ID(); ?>"></div>
-<?php endwhile; endif; ?>
-
 <div id="content-wrapper-head"></div>
 	<div id="content-wrapper">
 
diff --git a/sidebar-header.php b/sidebar-header.php
index e6c385d..d5a4a45 100644
--- a/sidebar-header.php
+++ b/sidebar-header.php
@@ -1,3 +1,5 @@
+<?php if (comicpress_is_active_sidebar('Header')) { ?>
 <div id="sidebar-header" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>">
 	<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Header') ) : ?><?php endif; ?>
 </div>
+<?php } ?>
\ No newline at end of file
diff --git a/sidebar-right.php b/sidebar-right.php
index 27d06b9..49a441c 100644
--- a/sidebar-right.php
+++ b/sidebar-right.php
@@ -1,6 +1,5 @@
 <?php global $disable_lrsidebars_frontpage; 
-	if ($disable_lrsidebars_frontpage == 'yes' && is_home()) { 
-} else {  ?>
+if ($disable_lrsidebars_frontpage != 'yes') { ?>
 <div id="sidebar-right">
 	<div class="sidebar-head"></div>
 		<div class="sidebar">