From 6ca5f2e9d547d209045b5e82a317590c962cfeaa Mon Sep 17 00:00:00 2001
From: Vladimir Panteleev <github.private@thecybershadow.net>
Date: Fri, 16 Mar 2018 03:48:04 +0200
Subject: [PATCH 1/2] Bug 1446236 - use urlbase in AntiSpam extension

---
 extensions/AntiSpam/lib/Config.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extensions/AntiSpam/lib/Config.pm b/extensions/AntiSpam/lib/Config.pm
index ba7df84c2b..3cddb77ed6 100644
--- a/extensions/AntiSpam/lib/Config.pm
+++ b/extensions/AntiSpam/lib/Config.pm
@@ -53,7 +53,9 @@ sub get_param_list {
       default => "This account has been automatically disabled as a result of "
         . "a high number of comments tagged as abusive.<br>\n<br>\n"
         . "All interactions on Bugzilla should follow our "
-        . "<a href=\"https://bugzilla.mozilla.org/page.cgi?id=etiquette.html\">"
+        . "<a href=\""
+        . Bugzilla->localconfig->{'urlbase'}
+        . "page.cgi?id=etiquette.html\">"
         . "etiquette guidelines</a>.<br>\n<br>\n"
         . "Please contact the address at the end of this message if you "
         . "believe this to be an error, or if you would like your account "

From dd940d64805152a965477488011d2158e766355e Mon Sep 17 00:00:00 2001
From: Vladimir Panteleev <git@thecybershadow.net>
Date: Sun, 28 Jun 2020 17:22:14 +0000
Subject: [PATCH 2/2] t/sqlite-memory.t: Fix test

Unbreak test after previous commit (accessing Bugzilla->localconfig
would load the configuration and alter the test behavior).
---
 t/sqlite-memory.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/sqlite-memory.t b/t/sqlite-memory.t
index 6b5d8bfd63..8079f9525b 100644
--- a/t/sqlite-memory.t
+++ b/t/sqlite-memory.t
@@ -12,7 +12,6 @@ use Test::More;
 use Test2::Tools::Mock;
 use Try::Tiny;
 use Capture::Tiny qw(capture_merged);
-use Bugzilla::Test::MockParams;
 
 BEGIN {
   $ENV{LOCALCONFIG_ENV} = 'BMO';
@@ -20,6 +19,7 @@ BEGIN {
   $ENV{BMO_db_name}     = ':memory:';
 }
 use Bugzilla;
+use Bugzilla::Test::MockParams;
 BEGIN { Bugzilla->extensions }