From 367d6f9b414ef052ff1182501b8c80e5d616f265 Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Sat, 23 Jan 2010 10:31:35 -0800
Subject: [PATCH] disable_lrsidebars_frontpage is now disable_lrsidebars  for
 the entire site

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 comicpress-options.php     | 2 +-
 functions.php              | 2 +-
 options/generaloptions.php | 6 +++---
 sidebar-left.php           | 2 +-
 sidebar-right.php          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/comicpress-options.php b/comicpress-options.php
index 8a207ef..6f7116d 100644
--- a/comicpress-options.php
+++ b/comicpress-options.php
@@ -71,7 +71,7 @@ function comicpress_admin() {
 				'comic_clicks_next',
 				'disable_default_comic_nav',
 				'enable_widgetarea_use_sidebar_css',
-				'disable_lrsidebars_frontpage',
+				'disable_lrsidebars',
 				'disable_footer_text',
 				'disable_blogheader',
 				'enable_comicpress_debug',
diff --git a/functions.php b/functions.php
index 74e7fd0..e93a5ef 100644
--- a/functions.php
+++ b/functions.php
@@ -133,7 +133,7 @@ function comicpress_load_options() {
 			'disable_comic_blog_frontpage' => false,
 			'disable_comic_blog_single' => false,
 			'disable_blog_frontpage' => false,
-			'disable_lrsidebars_frontpage' => false,
+			'disable_lrsidebars' => false,
 			'disable_footer_text' => false,
 			'disable_blogheader' => false,
 			'disable_page_titles' => false,
diff --git a/options/generaloptions.php b/options/generaloptions.php
index a007840..3ed75dd 100644
--- a/options/generaloptions.php
+++ b/options/generaloptions.php
@@ -152,12 +152,12 @@
 					</td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="disable_lrsidebars_frontpage"><?php _e('Disable home page sidebars','comicpress'); ?></label></th>
+					<th scope="row"><label for="disable_lrsidebars"><?php _e('Disable left and right sidebars','comicpress'); ?></label></th>
 					<td>
-						<input id="disable_lrsidebars_frontpage" name="disable_lrsidebars_frontpage" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_lrsidebars_frontpage']); ?> />
+						<input id="disable_lrsidebars" name="disable_lrsidebars" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_lrsidebars']); ?> />
 					</td>
 					<td>
-						<?php _e('Your home page will not display the default left/right sidebars. Minimalists dream. WARNING: Not recommended for use with Graphic Novel layouts.','comicpress'); ?>
+						<?php _e('Your site will not display the default left/right sidebars. Minimalists dream. WARNING: Not recommended for use with Graphic Novel layouts.','comicpress'); ?>
 					</td>
 				</tr>
 			</table>
diff --git a/sidebar-left.php b/sidebar-left.php
index c2d20f1..dc1dcf2 100644
--- a/sidebar-left.php
+++ b/sidebar-left.php
@@ -1,5 +1,5 @@
 <?php global $comicpress_options;
-if (!$comicpress_options['disable_lrsidebars_frontpage']) { ?>
+if (!$comicpress_options['disable_lrsidebars']) { ?>
 <div id="sidebar-left">
 	<div class="sidebar-head"></div>
 		<div class="sidebar">
diff --git a/sidebar-right.php b/sidebar-right.php
index 51e252b..2797cb5 100644
--- a/sidebar-right.php
+++ b/sidebar-right.php
@@ -1,5 +1,5 @@
 <?php global $comicpress_options;
-if (!$comicpress_options['disable_lrsidebars_frontpage']) { ?>
+if (!$comicpress_options['disable_lrsidebars']) { ?>
 <div id="sidebar-right">
 	<div class="sidebar-head"></div>
 		<div class="sidebar">