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/Bitly/lib/WebService.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'extensions/Bitly/lib')

diff --git a/extensions/Bitly/lib/WebService.pm b/extensions/Bitly/lib/WebService.pm
index b8ada56d2..4b44faa0e 100644
--- a/extensions/Bitly/lib/WebService.pm
+++ b/extensions/Bitly/lib/WebService.pm
@@ -18,7 +18,7 @@ use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Search;
 use Bugzilla::Search::Quicksearch;
-use Bugzilla::Util 'correct_urlbase';
+use Bugzilla::Util ();
 use Bugzilla::WebService::Util 'validate';
 use JSON;
 use LWP::UserAgent;
@@ -47,7 +47,7 @@ sub _validate_uri {
     my $uri = URI->new($url);
     $uri->query(undef);
     $uri->fragment(undef);
-    if ($uri->as_string ne correct_urlbase() . 'buglist.cgi') {
+    if ($uri->as_string ne Bugzilla->localconfig->{urlbase} . 'buglist.cgi') {
         ThrowUserError('bitly_unsupported');
     }
 
@@ -82,7 +82,7 @@ sub list {
     my $data = $search->data;
 
     # form a bug_id only url, sanity check the length
-    $uri = URI->new(correct_urlbase() . 'buglist.cgi?bug_id=' . join(',', map { $_->[0] } @$data));
+    $uri = URI->new(Bugzilla->localconfig->{urlbase} . 'buglist.cgi?bug_id=' . join(',', map { $_->[0] } @$data));
     if (length($uri->as_string) > CGI_URI_LIMIT) {
         ThrowUserError('bitly_failure', { message => "Too many bugs returned by search" });
     }
-- 
cgit v1.2.3-24-g4f1b