From 6b820f407698d9b262df5292ccc3180b9e914651 Mon Sep 17 00:00:00 2001
From: SecretR <secretr@e107.org>
Date: Mon, 29 Apr 2013 13:31:21 +0300
Subject: [PATCH] fixes #183, #185. Important change - $SC_STYLE (the
 replacement of v1 $sc_style) renamed to most propper $SC_WRAPPER. Testing
 still required.

---
 e107_core/templates/contact_template.php | 10 +++++-----
 e107_handlers/e107_class.php             |  4 ++--
 e107_handlers/shortcode_handler.php      |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/e107_core/templates/contact_template.php b/e107_core/templates/contact_template.php
index 8e0ad85ef..ee2805c1a 100644
--- a/e107_core/templates/contact_template.php
+++ b/e107_core/templates/contact_template.php
@@ -41,12 +41,12 @@ $CONTACT_TEMPLATE['menu'] =  '
  
  
 	// Option I - new sc style variable and format, global available per shortcode (mode also applied)
-	// sc_style is uppercased now - distinguished from the legacy $sc_style variable and compatible with the new template standards, we deprecate $sc_style soon
+	// sc_style is renamed to sc_wrapper and uppercased now - distinguished from the legacy $sc_style variable and compatible with the new template standards, we deprecate $sc_style soon
  
-	// $SC_STYLE['CONTACT_EMAIL_COPY'] 		= "<tr><td>{---}".LANCONTACT_07."</td></tr>";
-	// $SC_STYLE['CONTACT_PERSON'] 			= "<tr><td>".LANCONTACT_14."<br />{---}</td></tr>";
-	// $SC_STYLE['CONTACT_IMAGECODE'] 			= "<tr><td>".LANCONTACT_16."<br />{---}";
-	// $SC_STYLE['CONTACT_IMAGECODE_INPUT'] 	= "{---}</td></tr>";
+	// $SC_WRAPPER['CONTACT_EMAIL_COPY'] 		= "<tr><td>{---}".LANCONTACT_07."</td></tr>";
+	// $SC_WRAPPER['CONTACT_PERSON'] 			= "<tr><td>".LANCONTACT_14."<br />{---}</td></tr>";
+	// $SC_WRAPPER['CONTACT_IMAGECODE'] 			= "<tr><td>".LANCONTACT_16."<br />{---}";
+	// $SC_WRAPPER['CONTACT_IMAGECODE_INPUT'] 	= "{---}</td></tr>";
  
  	
 	// Option II - Wrappers, used ONLY with batch objects, requires explicit wrapper registration
diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 08d967e7c..d98db25eb 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -2187,9 +2187,9 @@ class e107
 			self::setRegistry($regPath, (isset($$var) ? $$var : array()));
 			
 			// sc_style not a global anymore and uppercase
-			if(isset($SC_STYLE))
+			if(isset($SC_WRAPPER))
 			{
-				self::scStyle($SC_STYLE);
+				self::scStyle($SC_WRAPPER);
 			}
 			
 			// ID_WRAPPER support
diff --git a/e107_handlers/shortcode_handler.php b/e107_handlers/shortcode_handler.php
index d7c01f60e..dd94e10de 100644
--- a/e107_handlers/shortcode_handler.php
+++ b/e107_handlers/shortcode_handler.php
@@ -1017,7 +1017,7 @@ class e_parse_shortcode
 						}
 						if (isset($this->sc_style[$code]['post']))
 						{
-							$post = $ret.$this->sc_style[$code]['post'];
+							$post = $this->sc_style[$code]['post'];
 						}
 					}
 					// new way - same format as wrapper