From a73d8fdc8aad5d4aca9f5fd44fa096ecddca8b58 Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Fri, 25 Dec 2009 12:06:24 -0800
Subject: [PATCH] Layout Fix for the narrowcolumn when fixnig the v3cr

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 functions.php   | 10 +++++-----
 layout-head.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/functions.php b/functions.php
index 5736a1c..c7dc854 100644
--- a/functions.php
+++ b/functions.php
@@ -1,7 +1,5 @@
 <?php
 
-global $comicpress_options;
-
 // the_post_thumbnail('thumbnail/medium/full');
 if (function_exists('add_theme_support')) {
 	add_theme_support( 'post-thumbnails' );
@@ -44,6 +42,7 @@ function __comicpress_widgets_init() {
 
 function __comicpress_init() {
 	global $comicpress_options, $__comicpress_handlable_classes;
+	$comicpress_options = array();
 	// Check if the $comicpress_options exist, if not set defaults
 	$comicpress_options = comicpress_load_options();
 	// xili-language plugin check
@@ -124,6 +123,8 @@ function comicpress_load_options() {
 	if (empty($comicpress_options)) {
 		$comicpress_options['comicpress_version'] = '2.9.0.7';
 		foreach (array(
+			'cp_theme_layout' => 'standard',
+			
 			'disable_comic_frontpage' => false,
 			'disable_comic_blog_frontpage' => false,
 			'disable_comic_blog_single' => false,
@@ -211,11 +212,10 @@ function comicpress_load_options() {
 }
 
 function is_cp_theme_layout($choices) {
-	global $comicpress_options;
+	$comicpress_options = comicpress_load_options();
 	$choices = explode(",", $choices);
 	foreach ($choices as $choice) {
-
-		if ($choice == $comicpress_options['cp_theme_layout']) {
+		if ($comicpress_options['cp_theme_layout'] == $choice) {
 			return true;
 		}
 	}
diff --git a/layout-head.php b/layout-head.php
index 7319426..32bdf81 100644
--- a/layout-head.php
+++ b/layout-head.php
@@ -14,7 +14,7 @@
 		<div id="pagewrap-left">
 	<?php } ?>
 
-	<?php if (!is_cp_theme_layout('gn,rgn,v3cr')) { ?>
+	<?php if (is_cp_theme_layout('v,v3c')) { ?>
 		<div id="content" class="narrowcolumn">
 			<div class="column">
 	<?php } ?>