From bae1436fc148c9cba0391ea585db6a02f90ad2ef Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Sat, 23 Jan 2010 02:22:37 -0800
Subject: [PATCH] Deprecated .column is being removed for good, and
 layout-head.php fix for proper logic.

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 layout-head.php | 37 ++++++++++++++++++-------------------
 style.css       |  5 -----
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/layout-head.php b/layout-head.php
index 8d02107..10af445 100644
--- a/layout-head.php
+++ b/layout-head.php
@@ -17,28 +17,28 @@
 	<?php if (is_cp_theme_layout('v,v3c')) { ?>
 		<div id="content" class="narrowcolumn">
 			<?php get_sidebar('overblog'); ?>
-			<div class="column">
 	<?php } ?>
 
 <?php 
-	if (!$comicpress_options['disable_comic_frontpage'] && is_home()) {
-		Protect();
-		$comic_query = 'showposts=1&cat='.get_all_comic_categories_as_cat_string();
-		$posts = query_posts($comic_query);
-		if (have_posts()) {
-			while (have_posts()) : the_post();
-				global $frontpage_postnum;
-				$frontpage_postnum = $post->ID;
-				$wp_query->is_single = true;
-				comicpress_display_comic_area();
-			endwhile;
+	if (is_home()) {
+		
+		if (!$comicpress_options['disable_comic_frontpage']) {
+			$comic_query = 'showposts=1&cat='.get_all_comic_categories_as_cat_string();
+			query_posts($comic_query);
+			if (have_posts()) {
+				while (have_posts()) : the_post();
+					$temp_single = $wp_query->is_single;
+					$wp_query->is_single = true;
+					comicpress_display_comic_area();
+					$wp_query->is_single = $temp_single;
+					$temp_single = null;
+				endwhile;
+			}
+		}
+	} else {
+		if (is_single() && in_comic_category()) {
+			comicpress_display_comic_area();
 		}
-		Restore();
-		UnProtect();
-		wp_reset_query();
-	}
-	if (is_single() & in_comic_category()) {
-		comicpress_display_comic_area();
 	}
 ?>
 
@@ -57,7 +57,6 @@
 	<?php if (!is_cp_theme_layout('v3c,v')) { ?>
 		<div id="content" class="narrowcolumn">
 			<?php get_sidebar('overblog'); ?>
-			<div class="column">
 	<?php } ?>
 <?php } ?>
 	
diff --git a/style.css b/style.css
index 4677aad..b2dec89 100644
--- a/style.css
+++ b/style.css
@@ -444,7 +444,6 @@ h4, h4 a {
 
 	.narrowcolumn {
 		width: 540px;
-		padding: 5px 10px;
 	}
 	
 	/* add 10px to smaller width layouts */
@@ -458,10 +457,6 @@ h4, h4 a {
 		overflow: hidden;
 	}
 	
-	.column {
-		overflow: hidden;
-	}
-	
 	.column_one {
 		width: 48%; 
 		float: left;