* Display links to archived bugs for all searches

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 43dec82f51fd61e788445b2c7ce10ad9edf1d7fd..bd0d275e96efbba56572e12d8cf15ddb853fff70 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -438,11 +438,6 @@ if (defined $pkg || defined $src) {
                 push @references, sprintf "to the source package <a href=\"%s\">%s</a>'s bug page", srcurl($srcforpkg), htmlsanit($srcforpkg);
             }
         }
-        if ($pkg) {
-            set_option("archive", !$archive);
-            push @references, sprintf "to the <a href=\"%s\">%s reports for %s</a>", pkgurl($pkg), ($archive ? "active" : "archived"), htmlsanit($pkg);
-            set_option("archive", $archive);
-        }
         if (@references) {
             $references[$#references] = "or $references[$#references]" if @references > 1;
             print "<p>You might like to refer ", join(", ", @references), ".</p>\n";
@@ -467,6 +462,16 @@ if (defined $pkg || defined $src) {
     print "different addresses.\n";
 }
 
+set_option("archive", !$archive);
+print "<p>See the <a href=\"%s\">%s reports</a></p>",
+     urlsanit('pkgreport.cgi?'.join(';',
+                                   map {$_ eq 'archived'?():("$_=$param{$_}")
+                                   } keys %param,
+                                   ('archived='.$archive?"yes":"no")
+                                  )
+            ), ($archive ? "active" : "archived");
+set_option("archive", $archive);
+
 print $result if $showresult;
 
 print pkg_javascript() . "\n";

diff --git a/debian/changelog b/debian/changelog
index 69d47bedc61f20880aca0d1efa9ffa72549388e3..78e00625065d7e2672fb89a7f5b48227dd99a27c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -126,6 +126,7 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Use RFC compliant dates in headers (closes: #362935)
     - Split forwarded on commas for linking (closes: #367813)
     - Don't display duplicate bugs (closes: #348116)
+    - Display links to archived bugs for all searches (closes: #53710)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100