From 8d9e9ba16da32ea0661c89ce0c2a4e04608b477e Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 19 Jun 2019 21:30:32 +0000
Subject: [PATCH] mediawiki: some more settings cleanup, fix ConfirmEdit
 loading.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 roles/mediawiki/templates/LocalSettings.php.fp.j2 | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2
index 98785f2b11..b9eaa6876f 100644
--- a/roles/mediawiki/templates/LocalSettings.php.fp.j2
+++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2
@@ -12,8 +12,6 @@
 # Added for timeout testing
 require_once( "includes/DefaultSettings.php" );
 #$wgDebugLogFile         = '/tmp/out.log';
-require_once( "extensions/ConfirmEdit/ConfirmEdit.php" );
-#require_once( "extensions/ConfirmEdit/FancyCaptcha.php" );
 $wgCaptchaClass = 'SimpleCaptcha';
 #$wgCaptchaClass = 'FancyCaptcha';
 #$wgCaptchaDirectory = "/mnt/web/attachments/captchas";
@@ -304,20 +302,14 @@ $wgNamespacesToBeSearchedDefault = array(
         NS_TEST_RESULTS         => true,
         NS_TEST_RESULTS_TALK    => false
 );
-require_once "$IP/extensions/OpenID/OpenID.setup.php";
-#require 'extensions/StubManager/StubManager.php';
-#require 'extensions/HNP/HNP.php';
-#require_once "$IP/extensions/ParserFunctions/ParserFunctions.php";
-#require_once "$IP/extensions/Interwiki/Interwiki.php";
-#require_once "$IP/extensions/Cite/Cite.php";
 require_once "$IP/extensions/fedmsg-emit.php";
 require_once "$IP/extensions/HTTP302Found/HTTP302Found.php";
 require_once "$IP/extensions/RSS/RSS.php";
-#require_once "$IP/extensions/BassetSubmitter.php";
 require_once "$IP/extensions/FedoraDocsRedirect/FedoraDocsRedirect.php";
 wfLoadExtension( 'ParserFunctions' );
 wfLoadExtension( 'Interwiki' );
 wfLoadExtension( 'Cite' );
+wfLoadExtension( 'ConfirmEdit' );
 
 $wgShowExceptionDetails = true;