Merge branch 'bug/405-css-emails'

4 files changed, 2 insertions, 8 deletions

diff --git a/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php b/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
index 2c9c4ecc3..6c3ea5f5d 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
@@ -812,7 +812,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
                                          '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
                                          '#^\s+<#Ss'                                                               => '<',
                                          '#>\s+$#Ss'                                                               => '>',
-                                         $this->stripRegEx                                                         => ' ');
+                                         $this->stripRegEx                                                         => '');
 
                     $text = preg_replace(array_keys($expressions), array_values($expressions), $text);
                     $_offset = 0;
@@ -828,7 +828,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
                         }
                     }
                 } else {
-                    $text = preg_replace($this->stripRegEx, ' ', $text);
+                    $text = preg_replace($this->stripRegEx, '', $text);
                 }
             }
             return new Smarty_Internal_ParseTree_Text($text);
diff --git a/themes/default/template/mail/text/html/global-mail-css.tpl b/themes/default/template/mail/text/html/global-mail-css.tpl
index 59a1bde2f..23a3be3a3 100644
--- a/themes/default/template/mail/text/html/global-mail-css.tpl
+++ b/themes/default/template/mail/text/html/global-mail-css.tpl
@@ -1,4 +1,3 @@
-{strip}
 /* page */
 body {
   font-family:"Verdana", "Helvetica", "Optima", sans-serif;
@@ -102,4 +101,3 @@ hr {
   border-style:solid;
   margin:1em;
 }
-{/strip}
\ No newline at end of file
diff --git a/themes/default/template/mail/text/html/mail-css-clear.tpl b/themes/default/template/mail/text/html/mail-css-clear.tpl
index 98b0337d9..c2e908ede 100644
--- a/themes/default/template/mail/text/html/mail-css-clear.tpl
+++ b/themes/default/template/mail/text/html/mail-css-clear.tpl
@@ -1,4 +1,3 @@
-{strip}
 /* page */
 body {
   color:#111;
@@ -70,4 +69,3 @@ blockquote {
   background:#eee;
   border-right:1px solid #fff;
 }
-{/strip}
\ No newline at end of file
diff --git a/themes/default/template/mail/text/html/mail-css-dark.tpl b/themes/default/template/mail/text/html/mail-css-dark.tpl
index 390a7dfb6..f4e8a3f95 100644
--- a/themes/default/template/mail/text/html/mail-css-dark.tpl
+++ b/themes/default/template/mail/text/html/mail-css-dark.tpl
@@ -1,4 +1,3 @@
-{strip}
 /* page */
 body {
   color:#fff;
@@ -84,4 +83,3 @@ blockquote {
 hr {
   border-color:#555;
 }
-{/strip}
\ No newline at end of file