From e2562d52c5888e59e19064611ff47884c86068dc Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Wed, 28 Nov 2012 19:07:08 -0800
Subject: [PATCH] Should address Issue #22

---
 e107_core/shortcodes/batch/signup_shortcodes.php | 8 +++-----
 e107_themes/templates/signup_template.php        | 6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/e107_core/shortcodes/batch/signup_shortcodes.php b/e107_core/shortcodes/batch/signup_shortcodes.php
index eb00957f7..d9eec8d77 100755
--- a/e107_core/shortcodes/batch/signup_shortcodes.php
+++ b/e107_core/shortcodes/batch/signup_shortcodes.php
@@ -116,13 +116,11 @@ class signup_shortcodes extends e_shortcode
 	
 	
 	function sc_signup_signup_text()
-	{
-			
-		global $SIGNUP_TEXT;
+	{		
+		// global $SIGNUP_TEXT;
 		$pref = e107::getPref();
 		$tp = e107::getParser();
-		
-		
+			
 		if($pref['signup_text'])
 		{
 			return $tp->toHTML($pref['signup_text'], TRUE, 'parse_sc,defs');
diff --git a/e107_themes/templates/signup_template.php b/e107_themes/templates/signup_template.php
index 32da56593..65999a522 100755
--- a/e107_themes/templates/signup_template.php
+++ b/e107_themes/templates/signup_template.php
@@ -185,9 +185,9 @@ if(!defined($COPPA_FAIL))
 	$COPPA_FAIL = "<div style='text-align:center'>".LAN_SIGNUP_9."</div>";
 }
 
-if(!defined($SIGNUP_TEXT))
+//if(!defined($SIGNUP_TEXT))
 {
-	$SIGNUP_TEXT =	$tp->parseTemplate("{SIGNUP_SIGNUP_TEXT}"); // .
+	//$SIGNUP_TEXT =	$tp->parseTemplate("{SIGNUP_SIGNUP_TEXT}"); // .
 	//LAN_SIGNUP_80." <b>".LAN_SIGNUP_29."</b><br /><br />".
 	//LAN_SIGNUP_30."<br />".
 	//LAN_SIGNUP_85;
@@ -196,7 +196,7 @@ if(!defined($SIGNUP_TEXT))
 if(!defined($SIGNUP_BEGIN))
 {
 	$SIGNUP_BEGIN = "
-	{SIGNUP_FORM_OPEN}".$SIGNUP_TEXT;
+	{SIGNUP_FORM_OPEN} {SIGNUP_SIGNUP_TEXT}";
 }
 
 if(!defined($SIGNUP_BODY))