X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fbugreport.cgi;h=226258a1b26063fc48ed17d9ef5470289a3412c2;hb=fdffad3b44892e2049aa2bc2588bf4ee991360ef;hp=2202ca0cae3e9b16dbb62716931a11e5905b1a61;hpb=4ad8475827b40cc70b38e68a568ca5635096a860;p=debbugs.git

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 2202ca0..226258a 100755
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -24,14 +24,20 @@ use Debbugs::CGI qw(:url :html :util :cache :usertags);
 use Debbugs::CGI::Bugreport qw(:all);
 use Debbugs::Common qw(buglog getmaintainers make_list bug_status);
 use Debbugs::Packages qw(getpkgsrc);
+use Debbugs::DB;
 use Debbugs::Status qw(splitpackages split_status_fields get_bug_status isstrongseverity);
 
 use Scalar::Util qw(looks_like_number);
 
 use Debbugs::Text qw(:templates);
-
+use URI::Escape qw(uri_escape_utf8);
 use List::AllUtils qw(max);
 
+my $s;
+if (defined $config{database}) {
+    $s = Debbugs::DB->connect($config{database}) or
+        die "Unable to connect to database";
+}
 
 use CGI::Simple;
 my $q = new CGI::Simple;
@@ -188,6 +194,7 @@ my %status;
 if ($need_status) {
     %status = %{split_status_fields(get_bug_status(bug=>$ref,
 						   bugusertags => \%bugusertags,
+                                                   defined $s?(schema => $s):(),
 						  ))}
 }
 
@@ -454,13 +461,13 @@ print fill_in_template(template => 'cgi/bugreport',
 				     msg           => $msg,
 				     isstrongseverity => \&Debbugs::Status::isstrongseverity,
 				     html_escape   => \&Debbugs::CGI::html_escape,
+                                     uri_escape    => \&URI::Escape::uri_escape_utf8,
 				     looks_like_number => \&Scalar::Util::looks_like_number,
 				     make_list        => \&Debbugs::Common::make_list,
 				    },
 		       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,
 				    },