- Add link from singlemsg page to main page; remove useless links

    (closes: #404806)

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 2052898169d5a3495c32c8f53fca3d71b85177bc..4c8e05d750766b56a2f996e9fdf969602d7daa77 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -604,17 +604,22 @@ function toggle_infmessages()
 END
 print "<H1>" . "$gProject $gBug report logs - <A HREF=\"mailto:$ref\@$gEmailDomain\">$short</A>" .
       "<BR>" . $title . "</H1>\n";
-
 print "$descriptivehead\n";
-print qq(<p><a href="mailto:$ref\@$gEmailDomain">Reply</a> ),
-     qq(or <a href="mailto:$ref-subscribe\@$gEmailDomain">subscribe</a> ),
-     qq(to this bug.</p>\n);
-print qq(<p><a href="javascript:toggle_infmessages();">Toggle useless messages</a></p>);
-printf qq(<div class="msgreceived"><p>View this report as an <a href="%s">mbox folder</a>, ).
-     qq(<a href="%s">status mbox</a>, <a href="%s">maintainer mbox</a></p></div>\n),
-     html_escape(bug_url($ref, mbox=>'yes')),
-     html_escape(bug_url($ref, mbox=>'yes',mboxstatus=>'yes')),
-     html_escape(bug_url($ref, mbox=>'yes',mboxmaint=>'yes'));
+
+if (looks_like_number($msg)) {
+     printf qq(<p><a href="%s">Full log</a></p>),html_escape(bug_url($ref));
+}
+else {
+     print qq(<p><a href="mailto:$ref\@$gEmailDomain">Reply</a> ),
+         qq(or <a href="mailto:$ref-subscribe\@$gEmailDomain">subscribe</a> ),
+              qq(to this bug.</p>\n);
+     print qq(<p><a href="javascript:toggle_infmessages();">Toggle useless messages</a></p>);
+     printf qq(<div class="msgreceived"><p>View this report as an <a href="%s">mbox folder</a>, ).
+         qq(<a href="%s">status mbox</a>, <a href="%s">maintainer mbox</a></p></div>\n),
+              html_escape(bug_url($ref, mbox=>'yes')),
+                   html_escape(bug_url($ref, mbox=>'yes',mboxstatus=>'yes')),
+                        html_escape(bug_url($ref, mbox=>'yes',mboxmaint=>'yes'));
+}
 print "$log";
 print "<HR>";
 print "<p class=\"msgreceived\">Send a report that <a href=\"/cgi-bin/bugspam.cgi?bug=$ref\">this bug log contains spam</a>.</p>\n<HR>\n";

diff --git a/debian/changelog b/debian/changelog
index bd8d65d15942dc46834279b0b87986fcf6924eb3..40c9c6530b8e8a749196d474b4a65e2d986cd6eb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -154,6 +154,8 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - When searching by source package, include the source package itself
       in the list of packages to search for, even if there is no binary
       package called that. (closes: #414825)
+    - Add link from singlemsg page to main page; remove useless links
+      (closes: #404806)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100