Index: trunk/core/kernel/parser/template_parser.php
===================================================================
diff -u -r7391 -r7635
--- trunk/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 7391)
+++ trunk/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 7635)
@@ -144,7 +144,10 @@
 
 	function ConvertToCode($data)
 	{
-		$code = '$o .= \''. str_replace("'", "\'", $data) .'\';';
+		$data = str_replace("\\", "\\\\", $data); // escape any "\"
+		$data = str_replace("'", "\'", $data); // escape "'"
+
+		$code = '$o .= \''. $data .'\';';
 		$code = explode("\n", $code);
 		return $code;
 	}
@@ -192,6 +195,12 @@
 
 			$this->Application->CompiledFunctions[$f_name] = $real_name;
 
+			/*if (defined('DEBUG_MODE') && DEBUG_MODE && defined('DBG_PRE_PARSE') && DBG_PRE_PARSE) {
+				// this shows newly compiled functions (blocks)
+				global $debugger;
+				$f_body = "\t".'function '.$real_name.'($params)'."\n\t{\n".$f_body."\t}\n\n";
+				$debugger->appendHTML($debugger->highlightString($f_body));
+			}*/
 		}
 	}
 
@@ -333,7 +342,13 @@
 		}
 
 		if ($opening_tag == '<!--') {
-			$this->AppendOutput('<!-- '.htmlspecialchars($tag). '-->');
+			if ($this->Application->IsAdmin()) {
+				$this->AppendOutput('<!-- '.htmlspecialchars($tag). '-->');
+			}
+			else {
+				$this->AppendOutput('<!-- '.$tag. '-->');
+				$this->AppendCompiledHTML('<!-- '.$tag. '-->');
+			}
 			$tag = '__COMMENT__';
 		}