From 0823a14d2b40ea97912f6af2656d8120dec6abb1 Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Thu, 24 Dec 2009 07:35:55 -0800
Subject: [PATCH] blogpwad and footerpwad classes removed and trying to cleanup
 the membersonly.php shortcode to not have the extra <p></p> need to figure
 that sucker out.

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 footer.php                | 10 +++-------
 functions/membersonly.php |  4 +++-
 index.php                 | 10 +++-------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/footer.php b/footer.php
index 80836b1..fb82da8 100644
--- a/footer.php
+++ b/footer.php
@@ -1,12 +1,8 @@
 <?php global $wpmu_version, $comicpress_options; ?>
 <div id="footer">
-	<?php if (function_exists('the_project_wonderful_ad')) { ?>
-		<div class="footerpwad">
-			<center>
-			<?php the_project_wonderful_ad('footer'); ?>
-			</center>
-		</div>
-	<?php } ?>
+	<?php if (function_exists('the_project_wonderful_ad')) {
+		the_project_wonderful_ad('footer');
+	} ?>
 	<?php get_sidebar('footer'); ?>
 	<?php if (!$comicpress_options['disable_footer_text']) { ?>
 		<p>
diff --git a/functions/membersonly.php b/functions/membersonly.php
index 04592ba..9b450f5 100644
--- a/functions/membersonly.php
+++ b/functions/membersonly.php
@@ -52,7 +52,9 @@ function shortcode_for_comicpress_members_only( $atts, $content = null ) {
 	if ( !empty($current_user->ID) ) {
 		$is_member = get_usermeta($current_user->ID,'comicpress-is-member');
 		if ($is_member == 'yes' || current_user_can('publish_posts')) {
-			$returninfo = '<div class="members-only">'.$content.'</div>';
+			$returninfo = "<div class=\"members-only\">$content</div>\r\n";
+			$returninfo = str_replace('<p>', '', $returninfo);
+			$returninfo = str_replace('</p>', '', $returninfo);
 		}
 	}
 	return $returninfo;
diff --git a/index.php b/index.php
index 160e1a8..45a5c3f 100644
--- a/index.php
+++ b/index.php
@@ -16,13 +16,9 @@
 	UnProtect(); ?>
 <?php } ?>
 
-	<?php if (function_exists('the_project_wonderful_ad')) { ?>
-			<div class="blogpwad">
-				<center>
-				<?php the_project_wonderful_ad('blog'); ?>
-				</center>
-			</div>
-	<?php } ?>
+	<?php if (function_exists('the_project_wonderful_ad')) { 
+		the_project_wonderful_ad('blog');
+	} ?>
 
 	<?php get_sidebar('blog'); ?>