remove bug_url from the codebase

diff --git a/Debbugs/CGI.pm b/Debbugs/CGI.pm
index c70f6829483e0a020b1f042c740384f2ddbd4c04..0f44943a6bf5c427d44277685f7bc7c08c2321eb 100644 (file)
--- a/Debbugs/CGI.pm
+++ b/Debbugs/CGI.pm
@@ -17,8 +17,6 @@ Debbugs::CGI -- General routines for the cgi scripts
 
 use Debbugs::CGI qw(:url :html);
 
-html_escape(bug_url($ref,mbox=>'yes',mboxstatus=>'yes'));
-
 =head1 DESCRIPTION
 
 This module is a replacement for parts of common.pl; subroutines in
@@ -64,8 +62,8 @@ BEGIN{
      $DEBUG = 0 unless defined $DEBUG;
 
      @EXPORT = ();
-     %EXPORT_TAGS = (url    => [qw(bug_url bug_links bug_linklist maybelink),
-                               qw(set_url_params pkg_url version_url),
+     %EXPORT_TAGS = (url    => [qw(bug_links bug_linklist maybelink),
+                               qw(set_url_params version_url),
                                qw(submitterurl mainturl munge_url),
                                qw(package_links bug_links),
                               ],
@@ -108,44 +106,6 @@ sub set_url_params{
 }
 
 
-=head2 bug_url
-
-     bug_url($ref,mbox=>'yes',mboxstat=>'yes');
-
-Constructs urls which point to a specific
-
-XXX use Params::Validate
-
-=cut
-
-sub bug_url{
-     my $ref = shift;
-     my %params;
-     if (@_ % 2) {
-         shift;
-         %params = (%URL_PARAMS,@_);
-     }
-     else {
-         %params = @_;
-     }
-     carp "bug_url is deprecated, use bug_links instead";
-
-     return munge_url('bugreport.cgi?',%params,bug=>$ref);
-}
-
-sub pkg_url{
-     my %params;
-     if (@_ % 2) {
-         shift;
-         %params = (%URL_PARAMS,@_);
-     }
-     else {
-         %params = @_;
-     }
-     carp "pkg_url is deprecated, use package_links instead";
-     return munge_url('pkgreport.cgi?',%params);
-}
-
 =head2 munge_url
 
      my $url = munge_url($url,%params_to_munge);
@@ -633,8 +593,7 @@ link class C<$class>.
 
 XXX Use L<Params::Validate>; we want to be able to support query
 arguments here too; we should be able to combine bug_links and this
-function into one. [Hell, bug_url should be one function with this one
-too.]
+function into one.
 
 =cut
 

diff --git a/Debbugs/CGI/Pkgreport.pm b/Debbugs/CGI/Pkgreport.pm
index 4391197c59a82eb0e44357831f7dc89df697cd72..e64300ad43cf8466ffd7614bae022ea79c98f020 100644 (file)
--- a/Debbugs/CGI/Pkgreport.pm
+++ b/Debbugs/CGI/Pkgreport.pm
@@ -367,7 +367,6 @@ sub pkg_htmlizebugs {
                            );
 
          my $html = "<li>"; #<a href=\"%s\">#%d: %s</a>\n<br>",
-              #bug_url($bug), $bug, html_escape($status{subject});
          $html .= short_bug_status_html(status  => \%status,
                                         options => $param{options},
                                        ) . "\n";

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 013175b01d2fe10c2336eb87a9a5f6502a45c06d..51744b2760a9d8b5e7038f6edbe4a78e5c89799f 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -461,7 +461,6 @@ print fill_in_template(template => 'cgi/bugreport',
                       hole_var  => {'&package_links' => \&Debbugs::CGI::package_links,
                                     '&bug_links'     => \&Debbugs::CGI::bug_links,
                                     '&version_url'   => \&Debbugs::CGI::version_url,
-                                    '&bug_url'       => \&Debbugs::CGI::bug_url,
                                     '&strftime'      => \&POSIX::strftime,
                                     '&maybelink'     => \&Debbugs::CGI::maybelink,
                                    },