Merge branch 'master' into newui

1 files changed, 19 insertions, 1 deletions

diff --git a/include/template_processor.php b/include/template_processor.php
index f64fe4c0f..d04da8c61 100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -199,8 +199,26 @@
 				$os=$s; $count++;
 				$s = str_replace($this->search,$this->replace, $s);
 			}
-			return $s;
+			return template_unescape($s);
 		}
 	}
 	
 	$t = new Template;
+
+
+
+
+function template_escape($s) {
+
+	return str_replace(array('$','{{'),array('!_Doll^Ars1Az_!','!_DoubLe^BraceS4Rw_!'),$s);
+
+
+}
+
+function template_unescape($s) {
+
+	return str_replace(array('!_Doll^Ars1Az_!','!_DoubLe^BraceS4Rw_!'),array('$','{{'),$s);
+
+
+
+}