From 588727c7e2b8954ec3dbde293cf4c4d68b119f9b Mon Sep 17 00:00:00 2001
From: xue <>
Date: Mon, 19 Jun 2006 18:38:29 +0000
Subject: Merge from 3.0 branch till 1185.

---
 framework/Web/UI/TTemplateManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'framework/Web/UI/TTemplateManager.php')

diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php
index 53239bd9..caa1dcbc 100644
--- a/framework/Web/UI/TTemplateManager.php
+++ b/framework/Web/UI/TTemplateManager.php
@@ -850,7 +850,7 @@ class TTemplate extends TApplicationComponent implements ITemplate
 			}
 			$length=strlen($value);
 			if($length>$textStart)
-				$expr.=".'".substr($value,$textStart,$length-$textStart)."'";
+				$expr.=".'".strtr(substr($value,$textStart,$length-$textStart),array("'"=>"\\'","\\"=>"\\\\"))."'";
 			if($isDataBind)
 				return array(self::CONFIG_DATABIND,ltrim($expr,'.'));
 			else
-- 
cgit v1.2.3