summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxue <>2006-12-01 19:07:51 +0000
committerxue <>2006-12-01 19:07:51 +0000
commit35064612126ad2a0825f0a7d70a0edf3b5244ceb (patch)
tree1d354b45caa52bdca62b9ca9879ea9e7dcc8a245
parent4aed8371a7ddf4ac9e4eec4ae8ed3ebe039ba976 (diff)
fixed #443.
-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 79475402..f46325a1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
Version 3.0.6 December 4, 2006
==============================
BUG: Ticket#442 - TPageService getBasePath in namespace form (Qiang)
+BUG: Ticket#443 - Template comment tag messed up with HTML comment tag (Qiang)
BUG: Ticket#467 - typo in TUrlMapping.php (Qiang)
BUG: TTableCell should render &nbsp; only when Text is not set and there's no child (Qiang)
BUG: global state was not saved when redirect() is invoked (Qiang)
diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php
index 326ca68d..43d3f03c 100644
--- a/framework/Web/UI/TTemplateManager.php
+++ b/framework/Web/UI/TTemplateManager.php
@@ -169,7 +169,7 @@ class TTemplate extends TApplicationComponent implements ITemplate
* '<%@\s*((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?")*)\s*%>' - directives
* '<%[%#~\\$=\\[](.*?)%>' - expressions
*/
- const REGEX_RULES='/<!--.*?--!>|<!--.*?-->|<\/?com:([\w\.]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/?>|<\/?prop:([\w\.]+)\s*>|<%@\s*((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?")*)\s*%>|<%[%#~\\$=\\[](.*?)%>/msS';
+ const REGEX_RULES='/<!--.*?--!?>|<\/?com:([\w\.]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/?>|<\/?prop:([\w\.]+)\s*>|<%@\s*((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?")*)\s*%>|<%[%#~\\$=\\[](.*?)%>/msS';
/**
* Different configurations of component property/event/attribute