Comment tag <!-- ... ---> (introduced in v3.1a) is changed to <!--- ... --->

4 files changed, 7 insertions, 3 deletions

diff --git a/HISTORY b/HISTORY
index a8d7a318..1ffcfb31 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
 Version 3.1.0 RC To be released
 ===============================
 CHG: removed <span> tags when TDataList.RepeatLayout is Raw (Qiang)
+CHG: changed comment tag to <!--- ... ---> (Qiang)
 
 Version 3.1.0 beta April 9, 2007
 ================================
diff --git a/UPGRADE b/UPGRADE
index aae33904..51499d39 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -15,6 +15,9 @@ Upgrading from v3.1b
   for header, footer and items. If your existing code rely on the span tags,

   you may use 'Flow' layout and set RepeatColumns as 1.

 

+- Comment tag <!-- ... ---> (introduced in v3.1a) is changed to <!--- ... --->

+

+

 Upgrading from v3.1a

 ---------------------

 - The signature of TActiveRecord::finder() is changed. This affects

diff --git a/demos/quickstart/protected/pages/Configurations/Templates1.page b/demos/quickstart/protected/pages/Configurations/Templates1.page
index 9a71d6a5..93f5662f 100644
--- a/demos/quickstart/protected/pages/Configurations/Templates1.page
+++ b/demos/quickstart/protected/pages/Configurations/Templates1.page
@@ -78,12 +78,12 @@ Template control tag is optional in a template. Each template can contain at mos
 Comment tags are used to put in a template developer comments that will not display to end-users. Contents enclosed within a comment tag will be treated as raw text strings and PRADO will not attempt to parse them. Comment tags cannot be used within property values. The format of comment tags is as follows,

 </p>

 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code_180078">

-&lt;!--

+&lt;!---

 Comments INVISIBLE to end-users

 ---&gt;

 </com:TTextHighlighter>

 <div class="note"><b class="tip">Note:</b>

-The new comment tag <tt>&lt;!-- ... ---&gt;</tt> has been introduced since PRADO version 3.1. Previously, it was <tt>&lt;!-- ... --!&gt;</tt> which was deprecated because some editors have problems in syntax-highlighting such tags. </div>

+The new comment tag <tt>&lt;!--- ... ---&gt;</tt> has been introduced since PRADO version 3.1. Previously, it was <tt>&lt;!-- ... --!&gt;</tt> which was deprecated because some editors have problems in syntax-highlighting such tags. </div>

 

 <h2 id="1601">Include Tags</h2>

 <p id="180178" class="block-content">

diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php
index 286aa252..6fe56f4d 100644
--- a/framework/Web/UI/TTemplateManager.php
+++ b/framework/Web/UI/TTemplateManager.php
@@ -177,7 +177,7 @@ class TTemplate extends TApplicationComponent implements ITemplate
 	 *	'<%[%#~\\$=\\[](.*?)%>'  - expressions

 	 *  '<prop:([\w\.]+)((?:\s*[\w\.]+=\'.*?\'|\s*[\w\.]+=".*?"|\s*[\w\.]+=<%.*?%>)*)\s*\/>' - group subproperty tags

 	 */

-	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*%>|<%[%#~\\$=\\[](.*?)%>|<prop:([\w\.]+)((?:\s*[\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*%>|<%[%#~\\$=\\[](.*?)%>|<prop:([\w\.]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/>/msS';

 

 	/**

 	 * Different configurations of component property/event/attribute