From d75c46345bd5ea221db28df52942a91d6e8ebec4 Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Thu, 24 Dec 2009 07:51:05 -0800
Subject: [PATCH] shortcode fix again I hope for the <p></p> problem

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 functions/membersonly.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/functions/membersonly.php b/functions/membersonly.php
index 9b450f5..4505ea5 100644
--- a/functions/membersonly.php
+++ b/functions/membersonly.php
@@ -48,13 +48,13 @@ function comicpress_members_filter($query) {
 
 function shortcode_for_comicpress_members_only( $atts, $content = null ) {
 	global $post, $userdata, $profileuser, $current_user, $errormsg;
-	$returninfo = '<div class="non-member">'.__('There is Members Only content here.<br />To view this content you need to be a member of this site.','comicpress').'</div>';
+	$returninfo = '<div class="non-member"><p>'.__('There is Members Only content here.<br />To view this content you need to be a member of this site.','comicpress').'</p></div>';
 	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>\r\n";
-			$returninfo = str_replace('<p>', '', $returninfo);
-			$returninfo = str_replace('</p>', '', $returninfo);
+			$content = str_replace('<p>', '', $content);
+			$content = str_replace('</p>', '', $content);
+			$returninfo = "<div class=\"members-only\">\r\n<p>$content</p>\r\n</div>\r\n";
 		}
 	}
 	return $returninfo;