summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorFrank Becker <Frank@Frank-Becker.de>2012-05-27 19:58:45 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2012-05-27 19:58:45 +0200
commita1b2e423700e27df8fe287371bc4c4dd3de7bbe2 (patch)
treeb0883c77002c7d16ad598799b0b0766c0568d6b6 /template
parent2bc73c33a8d738de80dd54e77e8ff7d1f5a4f7b3 (diff)
downloadbugzilla-a1b2e423700e27df8fe287371bc4c4dd3de7bbe2.tar.gz
bugzilla-a1b2e423700e27df8fe287371bc4c4dd3de7bbe2.tar.xz
Bug 676039: The XML format for bugs should include the full name of attachment creators
r/a=LpSolit
Diffstat (limited to 'template')
-rw-r--r--template/en/default/bug/show.xml.tmpl3
-rw-r--r--template/en/default/pages/bugzilla.dtd.tmpl3
2 files changed, 5 insertions, 1 deletions
diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl
index 9964cd800..1d376f874 100644
--- a/template/en/default/bug/show.xml.tmpl
+++ b/template/en/default/bug/show.xml.tmpl
@@ -76,7 +76,8 @@
<filename>[% a.filename FILTER xml %]</filename>
<type>[% a.contenttype FILTER xml %]</type>
<size>[% a.datasize FILTER xml %]</size>
- <attacher>[% a.attacher.email FILTER email FILTER xml %]</attacher>
+ <attacher[% IF a.attacher.name != '' %] name="[% a.attacher.name FILTER xml %]"[% END -%]>
+ [% a.attacher.email FILTER email FILTER xml %]</attacher>
[%# This is here so automated clients can still use attachment.cgi %]
[% IF displayfields.token && user.id %]
<token>[% issue_hash_token([a.id, a.modification_time]) FILTER xml %]</token>
diff --git a/template/en/default/pages/bugzilla.dtd.tmpl b/template/en/default/pages/bugzilla.dtd.tmpl
index 2cf42a151..ee4492c61 100644
--- a/template/en/default/pages/bugzilla.dtd.tmpl
+++ b/template/en/default/pages/bugzilla.dtd.tmpl
@@ -138,6 +138,9 @@
isprivate (0|1) #REQUIRED
>
<!ELEMENT attacher (#PCDATA)>
+<!ATTLIST attacher
+ name CDATA #REQUIRED
+>
<!ELEMENT attachid (#PCDATA)>
<!ELEMENT date (#PCDATA)>
<!ELEMENT desc (#PCDATA)>