From: Frank Becker <Frank@Frank-Becker.de>
Date: Sun, 27 May 2012 17:58:45 +0000 (+0200)
Subject: Bug 676039: The XML format for bugs should include the full name of attachment creators
X-Git-Tag: bugzilla-4.3.2~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1b2e423700e27df8fe287371bc4c4dd3de7bbe2;p=thirdparty%2Fbugzilla.git

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 9964cd800f..1d376f874c 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 2cf42a151f..ee4492c614 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)>