summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxue <>2007-03-31 13:40:02 +0000
committerxue <>2007-03-31 13:40:02 +0000
commitce428db89f1f3ac5ff1b9b519522aa4701c9c4ad (patch)
tree0ceffd93a26d8b1f275ee0a58c07d21b35b1a000
parenta7db73d475f9732f3c785f388732692e1cb23543 (diff)
Fixed #566
-rw-r--r--HISTORY1
-rw-r--r--framework/Web/UI/TTemplateManager.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 1d360b86..54ea4332 100644
--- a/HISTORY
+++ b/HISTORY
@@ -14,6 +14,7 @@ BUG: Ticket#553 - I18N quickstart sample does not work (Qiang)
BUG: Ticket#555 - TNumberFormat throws exception (Qiang)
BUG: Ticket#557 - TAutoComplete is not fool-proof (Wei)
BUG: Ticket#560 - TActiveImageButton broken (Postback instead of Callback) (Wei)
+BUG: Ticket#566 - <%[ tags (localize tags) missing escaping (Qiang)
BUG: Ticket#573 - NumberFormat Bug (Wei)
BUG: Ticket#579 - The rating list lost its Javascript in changeset [1775] (Wei).
BUG: TXmlElement did not encode attribute and text values when being saved as a string (Qiang)
diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php
index a68b4c51..d71662ca 100644
--- a/framework/Web/UI/TTemplateManager.php
+++ b/framework/Web/UI/TTemplateManager.php
@@ -655,7 +655,7 @@ class TTemplate extends TApplicationComponent implements ITemplate
$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"\$this->publishFilePath('$this->_contextPath/$literal')"));
else if($str[2]==='[')
{
- $literal=trim(substr($literal,0,strlen($literal)-1));
+ $literal=strtr(trim(substr($literal,0,strlen($literal)-1)),array("'"=>"\'","\\"=>"\\\\"));
$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"Prado::localize('$literal')"));
}
}