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/Push/lib/Connector.disabled/AMQP.pm       | 2 +-
 extensions/Push/lib/Connector.disabled/ServiceNow.pm | 2 +-
 extensions/Push/lib/Connector/Spark.pm               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'extensions/Push')

diff --git a/extensions/Push/lib/Connector.disabled/AMQP.pm b/extensions/Push/lib/Connector.disabled/AMQP.pm
index f712ee890..1ba365e21 100644
--- a/extensions/Push/lib/Connector.disabled/AMQP.pm
+++ b/extensions/Push/lib/Connector.disabled/AMQP.pm
@@ -27,7 +27,7 @@ sub init {
     if ($self->config->{queue}) {
         $self->{queue_name} = $self->config->{queue};
     } else {
-        my $queue_name = Bugzilla->params->{'urlbase'};
+        my $queue_name = Bugzilla->localconfig->{'urlbase'};
         $queue_name =~ s#^https?://##;
         $queue_name =~ s#/$#|#;
         $queue_name .= generate_random_password(16);
diff --git a/extensions/Push/lib/Connector.disabled/ServiceNow.pm b/extensions/Push/lib/Connector.disabled/ServiceNow.pm
index a6d84cbe0..d0ebdcf10 100644
--- a/extensions/Push/lib/Connector.disabled/ServiceNow.pm
+++ b/extensions/Push/lib/Connector.disabled/ServiceNow.pm
@@ -241,7 +241,7 @@ sub send {
     $request->content(to_json($data));
     $request->authorization_basic($self->config->{service_now_user}, $self->config->{service_now_pass});
 
-    $self->{lwp} ||= LWP::UserAgent->new(agent => Bugzilla->params->{urlbase});
+    $self->{lwp} ||= LWP::UserAgent->new(agent => Bugzilla->localconfig->{urlbase});
     my $result = $self->{lwp}->request($request);
 
     # http level errors
diff --git a/extensions/Push/lib/Connector/Spark.pm b/extensions/Push/lib/Connector/Spark.pm
index 3194bd3ab..e58ddfbe4 100644
--- a/extensions/Push/lib/Connector/Spark.pm
+++ b/extensions/Push/lib/Connector/Spark.pm
@@ -18,7 +18,7 @@ use Bugzilla::Extension::Push::Constants;
 use Bugzilla::Extension::Push::Util;
 use Bugzilla::Bug;
 use Bugzilla::Attachment;
-use Bugzilla::Util qw(correct_urlbase);
+use Bugzilla::Util ();
 
 use JSON qw(decode_json encode_json);
 use LWP::UserAgent;
@@ -108,7 +108,7 @@ sub send {
                 }
             }
         }
-        $text .= correct_urlbase() . "show_bug.cgi?id=" . $bug->id;
+        $text .= Bugzilla->localconfig->{urlbase} . "show_bug.cgi?id=" . $bug->id;
 
         my $room_id = $self->config->{spark_room_id};
         my $message_uri = $self->_spark_uri('messages');
-- 
cgit v1.2.3-24-g4f1b