diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 17b4fcea..a23528f0 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -121,7 +121,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.30-dev/35';
+    const SMARTY_VERSION = '3.1.30-dev/36';
 
     /**
      * define variable scopes
diff --git a/libs/sysplugins/smarty_internal_templatecompilerbase.php b/libs/sysplugins/smarty_internal_templatecompilerbase.php
index 87a92be9..031893cd 100644
--- a/libs/sysplugins/smarty_internal_templatecompilerbase.php
+++ b/libs/sysplugins/smarty_internal_templatecompilerbase.php
@@ -832,13 +832,12 @@ abstract class Smarty_Internal_TemplateCompilerBase
                             $_store ++;
                         }
                     }
+                    $space = $this->has_output && !preg_match('/^\s/', $text) ? ' ' : '';
                 } else {
                     $text = preg_replace($this->stripRegEx, '', $text);
                 }
-                $space = $this->has_output && !preg_match('/^\s/', $text) ? ' ' : '';
-                $this->has_output = false;
-
             }
+            $this->has_output = false;
             return new Smarty_Internal_ParseTree_Text($space . $text);
         }
         return null;