From: Don Armstrong <don@donarmstrong.com>
Date: Fri, 11 Aug 2017 21:52:09 +0000 (-0700)
Subject: remove bug_url from the codebase
X-Git-Tag: release/2.6.0~63
X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=commitdiff_plain;h=99e32a8e4f1a8f4fe099b76810db464c21ffd8f2

remove bug_url from the codebase
---

diff --git a/Debbugs/CGI.pm b/Debbugs/CGI.pm
index c70f682..0f44943 100644
--- 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 4391197..e64300a 100644
--- 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 013175b..51744b2 100755
--- 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,
 				    },