Bug 676039: The XML format for bugs should include the full name of attachment creators

r/a=LpSolit

diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl
index 9964cd800f91604976a8ed8b0fbb4efc2044ed96..1d376f874cfd37bfecf582e473c476d133553e8e 100644 (file)
--- 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 2cf42a151f21983cc390dd85a6d1b7bb50ef1e32..ee4492c614833f3a951e9b54febf6cac336c9025 100644 (file)
--- 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)>