allowing richer markup in error messages - will have to make sure all is properly escaped by the time it reaches the template

6 files changed, 9 insertions, 9 deletions

diff --git a/share/templates/en_US/earl_xml.tmpl b/share/templates/en_US/earl_xml.tmpl
index 5f29e8d..fb50589 100644
--- a/share/templates/en_US/earl_xml.tmpl
+++ b/share/templates/en_US/earl_xml.tmpl
@@ -46,7 +46,7 @@ X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF>
         </subject>
         <result rdf:resource="http://www.w3.org/2003/03/earl/1.00#fails" />
         <testCase rdf:resource="http://www.w3.org/Markup/" />
-        <note><TMPL_VAR NAME="msg" ESCAPE="HTML"></note>
+        <note><TMPL_VAR NAME="msg"></note>
       </Assertion>
     </asserts>
 </TMPL_LOOP>
diff --git a/share/templates/en_US/error_loop.tmpl b/share/templates/en_US/error_loop.tmpl
index 7ba334d..9e441ca 100644
--- a/share/templates/en_US/error_loop.tmpl
+++ b/share/templates/en_US/error_loop.tmpl
@@ -5,7 +5,7 @@
 <span class="err_type"><TMPL_IF NAME="err_type_info"><img src="images/info_icons/info.png" alt="Info" title="Info" /></TMPL_IF><TMPL_IF NAME="err_type_warn"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></TMPL_IF><TMPL_IF NAME="err_type_err"><img src="images/info_icons/error.png" alt="Error" title="Error" /></TMPL_IF></span>
         <em>Line <a href="#line-<TMPL_VAR NAME="line" ESCAPE="HTML">"><TMPL_VAR NAME="line" ESCAPE="HTML"></a>,
             Column <TMPL_VAR NAME="char" ESCAPE="HTML"></em>:
-        <span class="msg"><TMPL_VAR NAME="msg" ESCAPE="HTML"></span>
+        <span class="msg"><TMPL_VAR NAME="msg"></span>
 <TMPL_IF NAME="uri">(<a href="<TMPL_VAR NAME="uri" ESCAPE="HTML">">explain...</a>)</TMPL_IF>.
 <pre><code class="input"><TMPL_VAR NAME="src"></code></pre>
 <TMPL_IF NAME="expl"><TMPL_VAR NAME="expl"></TMPL_IF>
@@ -16,7 +16,7 @@
       <li<TMPL_IF NAME="class"> class="<TMPL_VAR NAME="class">"</TMPL_IF>>
           <span class="err_type"><TMPL_IF NAME="err_type_info"><img src="images/info_icons/info.png" alt="Info" title="Info" /></TMPL_IF><TMPL_IF NAME="err_type_warn"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></TMPL_IF><TMPL_IF NAME="err_type_err"><img src="images/info_icons/error.png" alt="Error" title="Error" /></TMPL_IF></span>
         <em>Line <TMPL_VAR NAME="line" ESCAPE="HTML">, Column <TMPL_VAR NAME="char" ESCAPE="HTML"></em>:
-        <span class="msg"><TMPL_VAR NAME="msg" ESCAPE="HTML"></span><TMPL_IF NAME="uri">(<a href="<TMPL_VAR NAME="uri" ESCAPE="HTML">">explain...</a>)</TMPL_IF>.<pre><code class="input"><TMPL_VAR NAME="src"></code></pre><TMPL_IF NAME="expl"><TMPL_VAR NAME="expl"></TMPL_IF>      </li>
+        <span class="msg"><TMPL_VAR NAME="msg"></span><TMPL_IF NAME="uri">(<a href="<TMPL_VAR NAME="uri" ESCAPE="HTML">">explain...</a>)</TMPL_IF>.<pre><code class="input"><TMPL_VAR NAME="src"></code></pre><TMPL_IF NAME="expl"><TMPL_VAR NAME="expl"></TMPL_IF>      </li>
   </TMPL_LOOP>
 </TMPL_IF>    
 <TMPL_IF NAME="has_errors"></ol></TMPL_IF>
diff --git a/share/templates/en_US/error_loop_grouped.tmpl b/share/templates/en_US/error_loop_grouped.tmpl
index 8e44d25..7ce2359 100644
--- a/share/templates/en_US/error_loop_grouped.tmpl
+++ b/share/templates/en_US/error_loop_grouped.tmpl
@@ -12,7 +12,7 @@
                           <em>Line <a href="#line-<TMPL_VAR NAME="line" 
                               ESCAPE="HTML">"><TMPL_VAR NAME="line" ESCAPE="HTML"></a>,
                               column <TMPL_VAR NAME="char" ESCAPE="HTML"></em>:
-                              <span><TMPL_VAR NAME="msg" ESCAPE="HTML"></span> 
+                              <span><TMPL_VAR NAME="msg"></span> 
                               <pre><code class="input"><TMPL_VAR NAME="src"></code></pre>
                         </li>
               
diff --git a/share/templates/en_US/soap_output.tmpl b/share/templates/en_US/soap_output.tmpl
index 482b01b..eb74beb 100644
--- a/share/templates/en_US/soap_output.tmpl
+++ b/share/templates/en_US/soap_output.tmpl
@@ -24,7 +24,7 @@ X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF>
             <m:error>
                 <m:line><TMPL_VAR NAME="line"></m:line>
                 <m:col><TMPL_VAR NAME="char" ESCAPE="HTML"></m:col>
-                <m:message><TMPL_VAR NAME="msg" ESCAPE="HTML"></m:message>
+                <m:message><TMPL_VAR NAME="msg"></m:message>
                 <m:messageid><TMPL_VAR NAME="num" ESCAPE="HTML"></m:messageid>
                 <m:explanation>  <![CDATA[
                   <TMPL_VAR NAME="expl">
@@ -43,7 +43,7 @@ X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF>
             <m:warning>
                 <m:line><TMPL_VAR NAME="line"></m:line>
                 <m:col><TMPL_VAR NAME="char" ESCAPE="HTML"></m:col>
-                <m:message><TMPL_VAR NAME="msg" ESCAPE="HTML"></m:message>
+                <m:message><TMPL_VAR NAME="msg"></m:message>
                   <m:messageid><TMPL_VAR NAME="num" ESCAPE="HTML"></m:messageid>
                   <m:explanation>  <![CDATA[
                     <TMPL_VAR NAME="expl">
diff --git a/share/templates/en_US/ucn_output.tmpl b/share/templates/en_US/ucn_output.tmpl
index fddd8fa..78a62b3 100644
--- a/share/templates/en_US/ucn_output.tmpl
+++ b/share/templates/en_US/ucn_output.tmpl
@@ -21,7 +21,7 @@ X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF>
 	    <error>
 	      <line><TMPL_VAR NAME="line"></line>
 	      <column><TMPL_VAR NAME="char" ESCAPE="HTML"></column>
-	      <message><TMPL_VAR NAME="msg" ESCAPE="HTML"></message>
+	      <message><TMPL_VAR NAME="msg"></message>
 	 	  <context><TMPL_VAR NAME="src"></context>
     <longmessage>
 		<p><a href="http://validator.w3.org/docs/errors.html#ve-<TMPL_VAR NAME="num">">Details...</a></p>
@@ -39,7 +39,7 @@ X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF>
 	  <warning>
 	    <line><TMPL_VAR NAME="line"></line>
 	    <column><TMPL_VAR NAME="char" ESCAPE="HTML"></column>
-	    <message><TMPL_VAR NAME="msg" ESCAPE="HTML"></message>
+	    <message><TMPL_VAR NAME="msg"></message>
     	<context><TMPL_VAR NAME="src"></context>
 	    <longmessage>
 			<p><a href="http://validator.w3.org/docs/errors.html#ve-<TMPL_VAR NAME="num">">Details...</a></p>
diff --git a/share/templates/en_US/xml_output.tmpl b/share/templates/en_US/xml_output.tmpl
index fd031ed..a316404 100644
--- a/share/templates/en_US/xml_output.tmpl
+++ b/share/templates/en_US/xml_output.tmpl
@@ -63,7 +63,7 @@ X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF>
 <TMPL_LOOP NAME="file_errors">
     <msg line="<TMPL_VAR NAME="line" ESCAPE="HTML">"
          col="<TMPL_VAR NAME="char" ESCAPE="HTML">"
-    ><TMPL_VAR NAME="msg" ESCAPE="HTML"></msg>
+    ><TMPL_VAR NAME="msg"></msg>
 </TMPL_LOOP>
   </messages>