From 35064612126ad2a0825f0a7d70a0edf3b5244ceb Mon Sep 17 00:00:00 2001 From: xue <> Date: Fri, 1 Dec 2006 19:07:51 +0000 Subject: fixed #443. --- HISTORY | 1 + framework/Web/UI/TTemplateManager.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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   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='/