From 271ed4a37e5bc37c7fbccc1b3458ca45a333c9d8 Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Sun, 22 Nov 2009 22:55:17 -0800
Subject: [PATCH] Added global $comicpress_options; to each of the sidebars so
 they can get the right data.

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 sidebar-above.php      | 3 ++-
 sidebar-blog.php       | 3 ++-
 sidebar-comicleft.php  | 3 ++-
 sidebar-comicright.php | 3 ++-
 sidebar-footer.php     | 3 ++-
 sidebar-header.php     | 3 ++-
 sidebar-left.php       | 2 +-
 sidebar-menubar.php    | 2 +-
 sidebar-over.php       | 3 ++-
 sidebar-overblog.php   | 3 ++-
 sidebar-right.php      | 2 +-
 sidebar-under.php      | 3 ++-
 sidebar-underblog.php  | 3 ++-
 13 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/sidebar-above.php b/sidebar-above.php
index 2ae92bc..bd2cb01 100644
--- a/sidebar-above.php
+++ b/sidebar-above.php
@@ -1,4 +1,5 @@
-<?php if (comicpress_is_active_sidebar('Above Header')) { ?>
+<?php global $comicpress_options;
+if (comicpress_is_active_sidebar('Above Header')) { ?>
 <div id="sidebar-aboveheader" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
 	<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Above Header') ) : ?><?php endif; ?>
 </div>
diff --git a/sidebar-blog.php b/sidebar-blog.php
index a923d51..750346f 100644
--- a/sidebar-blog.php
+++ b/sidebar-blog.php
@@ -1,4 +1,5 @@
-<?php if (comicpress_is_active_sidebar('Blog')) { ?>
+<?php global $comicpress_options;
+if (comicpress_is_active_sidebar('Blog')) { ?>
 <div id="sidebar-blog" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
 	<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Blog') ) : ?><?php endif; ?>
 </div>
diff --git a/sidebar-comicleft.php b/sidebar-comicleft.php
index 63a912f..c695aaf 100644
--- a/sidebar-comicleft.php
+++ b/sidebar-comicleft.php
@@ -1,4 +1,5 @@
-<?php if (comicpress_is_active_sidebar('Left of Comic')) { ?>
+<?php global $comicpress_options;
+if (comicpress_is_active_sidebar('Left of Comic')) { ?>
 <div id="sidebar-comicleft" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
 	<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Left of Comic') ) : ?><?php endif; ?>
 </div>
diff --git a/sidebar-comicright.php b/sidebar-comicright.php
index 1cd2809..9f7bb44 100644
--- a/sidebar-comicright.php
+++ b/sidebar-comicright.php
@@ -1,4 +1,5 @@
-<?php if (comicpress_is_active_sidebar('Right of Comic')) { ?>
+<?php global $comicpress_options;
+if (comicpress_is_active_sidebar('Right of Comic')) { ?>
 <div id="sidebar-comicright" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
 	<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Right of Comic') ) : ?><?php endif; ?>
 </div>
diff --git a/sidebar-footer.php b/sidebar-footer.php
index 139611a..6e5d1b6 100644
--- a/sidebar-footer.php
+++ b/sidebar-footer.php
@@ -1,4 +1,5 @@
-<?php if (comicpress_is_active_sidebar('Footer')) { ?>
+<?php global $comicpress_options;
+if (comicpress_is_active_sidebar('Footer')) { ?>
 <div id="sidebar-footer" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
 	<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Footer') ) : ?><?php endif; ?>
 </div>
diff --git a/sidebar-header.php b/sidebar-header.php
index d37467b..5d15990 100644
--- a/sidebar-header.php
+++ b/sidebar-header.php
@@ -1,4 +1,5 @@
-<?php if (comicpress_is_active_sidebar('Header')) { ?>
+<?php global $comicpress_options;
+if (comicpress_is_active_sidebar('Header')) { ?>
 <div id="sidebar-header" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
 	<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Header') ) : ?><?php endif; ?>
 </div>
diff --git a/sidebar-left.php b/sidebar-left.php
index ae05cdd..e210e2e 100644
--- a/sidebar-left.php
+++ b/sidebar-left.php
@@ -1,4 +1,4 @@
-<?php 
+<?php global $comicpress_options;
 	if ($comicpress_options['disable_lrsidebars_frontpage'] && is_home()) { 
 } else {  ?>
 <div id="sidebar-left">
diff --git a/sidebar-menubar.php b/sidebar-menubar.php
index 9940a4a..b36724a 100644
--- a/sidebar-menubar.php
+++ b/sidebar-menubar.php
@@ -1,4 +1,4 @@
-<?php 
+<?php global $comicpress_options;
 	if (!$comicpress_options['disable_default_menubar']) {
 		comicpress_menubar();
 	} 
diff --git a/sidebar-over.php b/sidebar-over.php
index 19fe33f..ffc39d4 100644
--- a/sidebar-over.php
+++ b/sidebar-over.php
@@ -1,4 +1,5 @@
-<?php if (comicpress_is_active_sidebar('Over Comic')) { ?>
+<?php global $comicpress_options;
+if (comicpress_is_active_sidebar('Over Comic')) { ?>
 <div id="sidebar-overcomic" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
 	<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Over Comic') ) : ?><?php endif; ?>
 </div>
diff --git a/sidebar-overblog.php b/sidebar-overblog.php
index 195c776..a6e6432 100644
--- a/sidebar-overblog.php
+++ b/sidebar-overblog.php
@@ -1,4 +1,5 @@
-<?php if (comicpress_is_active_sidebar('Over Blog')) { ?>
+<?php global $comicpress_options;
+if (comicpress_is_active_sidebar('Over Blog')) { ?>
 <div id="sidebar-overblog" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
 	<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Over Blog') ) : ?><?php endif; ?>
 </div>
diff --git a/sidebar-right.php b/sidebar-right.php
index 6a72ade..f12d23b 100644
--- a/sidebar-right.php
+++ b/sidebar-right.php
@@ -1,4 +1,4 @@
-<?php 
+<?php global $comicpress_options;
 if (!$comicpress_options['disable_lrsidebars_frontpage']) { ?>
 <div id="sidebar-right">
 	<div class="sidebar-head"></div>
diff --git a/sidebar-under.php b/sidebar-under.php
index 53ff84e..a0b40d4 100644
--- a/sidebar-under.php
+++ b/sidebar-under.php
@@ -1,4 +1,5 @@
-<?php if (comicpress_is_active_sidebar('Under Comic')) { ?>
+<?php global $comicpress_options;
+if (comicpress_is_active_sidebar('Under Comic')) { ?>
 <div id="sidebar-undercomic" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
 	<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Under Comic') ) : ?><?php endif; ?>
 </div>
diff --git a/sidebar-underblog.php b/sidebar-underblog.php
index a54f28b..5be2410 100644
--- a/sidebar-underblog.php
+++ b/sidebar-underblog.php
@@ -1,4 +1,5 @@
-<?php if (comicpress_is_active_sidebar('Under Blog')) { ?>
+<?php global $comicpress_options;
+if (comicpress_is_active_sidebar('Under Blog')) { ?>
 <div id="sidebar-underblog" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
 	<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Under Blog') ) : ?><?php endif; ?>
 </div>