From 164afe81a47bb8bcd4410561ca0825b2ab0b71c4 Mon Sep 17 00:00:00 2001
From: "kiko%async.com.br" <kiko%async.com.br>
Date: Tue, 27 Jul 2004 15:54:03 +0000
Subject: [PATCH] Fix for bug 252943: broken title in interdiff. Adds
 reasonable title while doing an interdiff, and fixes some broken and
 confusing double-linking in the text. r=joel, a=justdave.

---
 .../en/default/attachment/diff-header.html.tmpl       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl b/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl
index ff0f414a74e8..3d96d0f7024a 100644
--- a/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl
+++ b/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl
@@ -24,7 +24,11 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% title = BLOCK %]
-  Attachment #[% attachid %] for [% terms.Bug %] #[% bugid %]
+  [% IF attachid %]
+Attachment #[% attachid %] for [% terms.Bug %] #[% bugid %]
+  [% ELSE %]
+Interdiff of #[% oldid %] and #[% newid %] for #[% terms.Bug %] #[% bugid %]
+  [% END %]
 [% END %]
 
 [% style = BLOCK %]
@@ -187,14 +191,15 @@ tbody.file pre:empty {
     [% IF attachid %]
       [% description FILTER html %] (#[% attachid %])
     [% ELSE %]
+      [% USE url %]
       [% old_url = url('attachment.cgi', action = 'diff', id = oldid) %]
       [% new_url = url('attachment.cgi', action = 'diff', id = newid) %]
       Diff Between 
       <a href="[% old_url %]">[% old_desc FILTER html %]</a>
-      (<a href="[% old_url %]">#[% oldid %]</a>)
+      (#[% oldid %])
       and 
       <a href="[% new_url %]">[% new_desc FILTER html %]</a>
-      (<a href="[% new_url %]">#[% newid %]</a>)
+      (#[% newid %])
     [% END %]
     for <a href="show_bug.cgi?id=[% bugid %]">[% terms.Bug %] #[% bugid %]</a>
   [% END %]