diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2017-12-16 20:17:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-16 20:17:05 +0100 |
| commit | 334bead74bc9c5e819f14946726eaad40986d636 (patch) | |
| tree | e7ecf8d4eba2e6a046da8a9dc8828f35b75c7428 /extensions/SecureMail | |
| parent | 49e0df0d4e1b2f25be4ab36660dac5e47768c9a1 (diff) | |
| download | bugzilla-334bead74bc9c5e819f14946726eaad40986d636.tar.gz bugzilla-334bead74bc9c5e819f14946726eaad40986d636.tar.xz | |
Bug 1403777 - Migrate urlbase from params to localconfig
Diffstat (limited to 'extensions/SecureMail')
| -rw-r--r-- | extensions/SecureMail/Extension.pm | 6 |
1 files changed, 3 insertions, 3 deletions
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 |