135291 - template version strings break templates

Status: RESOLVED FIXED

(Bugzilla :: Bugzilla-General, defect, P1)

Description

[John Vandenberg]

The recent template version strings  (e.g. <!-- [e-mail] --> ) which
have been inserted into all templates break non-xml templates, specificually the
follow mail templates (from bug 23067)
token/emailchangenew.txt.tmpl
token/emailchangeold.txt.tmpl
token/tokencancel.txt.tmpl

Comment 1

[John Vandenberg]

The sidebar also appears to be breaking as a result.  The following error occurs
when the template version string is in template/default/sidebar/xul.tmpl

XML Parsing Error: xml processing instruction not at start of external entity
Location: https://dev.callista.com.au/bugzilla/sidebar.cgi
Line Number 4, Column 1:<?xml version="1.0"?>
^

Comment 2

[Dave Miller [:justdave]]

doh.  Knew there was a reason they were supposed to be in TT comments instead of
HTML... :-)

Comment 3

[Dave Miller [:justdave]]

*** Bug 135321 has been marked as a duplicate of this bug. ***

Comment 4

[Zach Lipton [:zach]]

see what I get for listening to your "put it in html comments" stuff? ;)

I'm going to be leaving for the weekend tomorrow, but I'll try and get 
something out for this ASAP because it's a blocker. What I am thinking is 
to change the version string to a template comment for all non html/xml 
files while leaving the rest as-is. Everyone agree?

cc'ing gerv on this as well

Comment 5

[Zach Lipton [:zach]]

Attachment: Patch to fix

Comment 6

[Zach Lipton [:zach]]

Attachment: Let us try this again...

Comment 7

[David D. Kilzer (ddk)]

Don't forget to add version strings to these templates:

template/default/global/user-error.html.tmpl
template/default/global/code-error.html.tmpl

Comment 8

[Zach Lipton [:zach]]

Attachment: Now I really start to get annoyed

Comment 9

[Bradley Baetz (:bbaetz)]

Comment on attachment 77611 [details] [diff] [review]
Now I really start to get annoyed

r=bbaetz

Comment 10

[Zach Lipton [:zach]]

Attachment: last upload had a problem

Comment 11

[Zach Lipton [:zach]]

moz doesn't like me, here:

? templatepatch.patch
Index: t/004template.t
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/t/004template.t,v
retrieving revision 1.9
diff -u -2 -r1.9 004template.t
--- t/004template.t	3 Apr 2002 20:01:01 -0000	1.9
+++ t/004template.t	4 Apr 2002 06:39:46 -0000
@@ -95,5 +95,5 @@
     open(TMPL,"$include_path/$file");
     my $firstline = <TMPL>;
-    if ($firstline =~ /<!-- \d+\.\d+\@[\w\._]+ -->/) {
+    if ($firstline =~ /\d+\.\d+\@[\w\.-]+/) {
         ok(1,"$file has a version string");
     } else {
Index: template/default/global/code-error.html.tmpl
===================================================================
RCS file:
/cvsroot/mozilla/webtools/bugzilla/template/default/global/code-error.html.tmpl,v
retrieving revision 1.1
diff -u -2 -r1.1 code-error.html.tmpl
--- template/default/global/code-error.html.tmpl	3 Apr 2002 23:00:29 -0000	1.1
+++ template/default/global/code-error.html.tmpl	4 Apr 2002 06:39:46 -0000
@@ -1,2 +1,3 @@
+<!-- [e-mail] -->
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
Index: template/default/global/user-error.html.tmpl
===================================================================
RCS file:
/cvsroot/mozilla/webtools/bugzilla/template/default/global/user-error.html.tmpl,v
retrieving revision 1.1
diff -u -2 -r1.1 user-error.html.tmpl
--- template/default/global/user-error.html.tmpl	3 Apr 2002 23:00:29 -0000	1.1
+++ template/default/global/user-error.html.tmpl	4 Apr 2002 06:39:46 -0000
@@ -1,2 +1,3 @@
+<!-- [e-mail] -->
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
Index: template/default/sidebar/xul.tmpl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/template/default/sidebar/xul.tmpl,v
retrieving revision 1.3
diff -u -2 -r1.3 xul.tmpl
--- template/default/sidebar/xul.tmpl	3 Apr 2002 20:01:38 -0000	1.3
+++ template/default/sidebar/xul.tmpl	4 Apr 2002 06:39:46 -0000
@@ -1,3 +1,3 @@
-<!-- [e-mail] -->
+[%# [e-mail] %]
 [%# -*- mode: sgml -*- %]
 [%# The contents of this file are subject to the Mozilla Public
Index: template/default/token/emailchangenew.txt.tmpl
===================================================================
RCS file:
/cvsroot/mozilla/webtools/bugzilla/template/default/token/emailchangenew.txt.tmpl,v
retrieving revision 1.2
diff -u -2 -r1.2 emailchangenew.txt.tmpl
--- template/default/token/emailchangenew.txt.tmpl	3 Apr 2002 20:01:42 -0000	1.2
+++ template/default/token/emailchangenew.txt.tmpl	4 Apr 2002 06:39:47 -0000
@@ -1,3 +1,3 @@
-<!-- [e-mail] -->
+[%# [e-mail] %]
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
Index: template/default/token/emailchangeold.txt.tmpl
===================================================================
RCS file:
/cvsroot/mozilla/webtools/bugzilla/template/default/token/emailchangeold.txt.tmpl,v
retrieving revision 1.2
diff -u -2 -r1.2 emailchangeold.txt.tmpl
--- template/default/token/emailchangeold.txt.tmpl	3 Apr 2002 20:01:42 -0000	1.2
+++ template/default/token/emailchangeold.txt.tmpl	4 Apr 2002 06:39:47 -0000
@@ -1,3 +1,3 @@
-<!-- [e-mail] -->
+[%# [e-mail] %]
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
Index: template/default/token/tokencancel.txt.tmpl
===================================================================
RCS file:
/cvsroot/mozilla/webtools/bugzilla/template/default/token/tokencancel.txt.tmpl,v
retrieving revision 1.2
diff -u -2 -r1.2 tokencancel.txt.tmpl
--- template/default/token/tokencancel.txt.tmpl	3 Apr 2002 20:01:42 -0000	1.2
+++ template/default/token/tokencancel.txt.tmpl	4 Apr 2002 06:39:47 -0000
@@ -1,3 +1,3 @@
-<!-- [e-mail] -->
+[%# [e-mail] %]
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file

Comment 12

[David D. Kilzer (ddk)]

r=ddk (will probably have to apply patch manually)

Comment 13

[Zach Lipton [:zach]]

fix is in