From ddfafaac2c1f18aca0fda3b4157acd935b9ac9a2 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sun, 30 Apr 2006 12:51:23 +0000
Subject: merge from 3.0 branch till 995.

---
 framework/Web/UI/TTemplateManager.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'framework/Web/UI')

diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php
index 90070a5a..5f75caf3 100644
--- a/framework/Web/UI/TTemplateManager.php
+++ b/framework/Web/UI/TTemplateManager.php
@@ -151,7 +151,7 @@ class TTemplateManager extends TModule
 class TTemplate extends TApplicationComponent implements ITemplate
 {
 	/**
-	 *  '<!.*?!>' - template comments
+	 *  '<!--.*?--!>' - template comments
 	 *	'<!--.*?-->'  - HTML comments
 	 *	'<\/?com:([\w\.]+)((?:\s*[\w\.]+=\'.*?\'|\s*[\w\.]+=".*?"|\s*[\w\.]+=<%.*?%>)*)\s*\/?>' - component tags
 	 *	'<\/?prop:([\w\.]+)\s*>'  - property tags
@@ -638,17 +638,17 @@ class TTemplate extends TApplicationComponent implements ITemplate
 						$expectPropEnd=false;
 					}
 				}
-				else if(strpos($str,'<!--')===0)	// HTML comments
+				else if(strpos($str,'<!--')===0)	// comments
 				{
-					// do nothing
-				}
-				else if(strpos($str,'<!')===0)		// template comments
-				{
-					if($expectPropEnd)
-						throw new TConfigurationException('template_comments_forbidden');
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
+					if(strrpos($str,'--!>')===strlen($str)-4)  // template comments
+					{
+						if($expectPropEnd)
+							throw new TConfigurationException('template_comments_forbidden');
+						if($matchStart>$textStart)
+							$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
+						$textStart=$matchEnd+1;
+					}
+					// else, HTML comments and we do nothing
 				}
 				else
 					throw new TConfigurationException('template_matching_unexpected',$match);
-- 
cgit v1.2.3