From 334bead74bc9c5e819f14946726eaad40986d636 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Sat, 16 Dec 2017 13:17:05 -0600
Subject: Bug 1403777 - Migrate urlbase from params to localconfig

---
 extensions/SecureMail/Extension.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'extensions/SecureMail')

diff --git a/extensions/SecureMail/Extension.pm b/extensions/SecureMail/Extension.pm
index 0219ac3ba..d684b5a39 100644
--- a/extensions/SecureMail/Extension.pm
+++ b/extensions/SecureMail/Extension.pm
@@ -32,7 +32,7 @@ use Bugzilla::Comment;
 use Bugzilla::Group;
 use Bugzilla::Object;
 use Bugzilla::User;
-use Bugzilla::Util qw(correct_urlbase trim trick_taint is_7bit_clean);
+use Bugzilla::Util qw(trim trick_taint is_7bit_clean);
 use Bugzilla::Error;
 use Bugzilla::Mailer;
 
@@ -568,7 +568,7 @@ sub _make_secure {
         my $message;
         my $email_type = $email->header('X-Bugzilla-Type');
         my $vars = {
-          'urlbase'    => correct_urlbase(),
+          'urlbase'    => Bugzilla->localconfig->{urlbase},
           'bug_id'     => $bug_id,
           'maintainer' => Bugzilla->params->{'maintainer'},
           'email_type' => $email_type
@@ -622,7 +622,7 @@ sub _pgp_encrypt {
         Data => $encrypted,
         Object => 'MESSAGE',
         Headers => {
-            Comment => correct_urlbase() . ($bug_id ? 'show_bug.cgi?id=' . $bug_id : ''),
+            Comment => Bugzilla->localconfig->{urlbase} . ($bug_id ? 'show_bug.cgi?id=' . $bug_id : ''),
         },
     );
     # until Crypt::OpenPGP makes the Version header optional we have to strip
-- 
cgit v1.2.3-24-g4f1b