From 4ecdc40fe6d4dc5006c60aa7be68cca760985e8c Mon Sep 17 00:00:00 2001
From: Grant Slater <git@firefishy.com>
Date: Thu, 4 Feb 2016 17:38:11 +0000
Subject: [PATCH] Mediawiki: minor extension include fixes

---
 .../mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb | 2 +-
 .../templates/default/mw-ext-MobileFrontend.inc.php.erb         | 2 +-
 .../templates/default/mw-ext-TitleBlacklist.inc.php.erb         | 2 +-
 .../mediawiki/templates/default/mw-ext-VisualEditor.inc.php.erb | 2 +-
 cookbooks/mediawiki/templates/default/mw-ext-cldr.inc.php.erb   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb
index 87c817c58..12fe10e5b 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb
@@ -1,5 +1,5 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
-require_once( $IP.'/extensions/CirrusSearch/CirrusSearch.php' );
+require_once($IP .'/extensions/CirrusSearch/CirrusSearch.php');
 $wgDisableSearchUpdate = false;
 $wgSearchType = 'CirrusSearch';
diff --git a/cookbooks/mediawiki/templates/default/mw-ext-MobileFrontend.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-MobileFrontend.inc.php.erb
index 5fb6b2ce2..d8ef82448 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-MobileFrontend.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-MobileFrontend.inc.php.erb
@@ -2,7 +2,7 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 #!!! NEEDS REQUIRE !!!
-require_once "$IP/extensions/MobileFrontend/MobileFrontend.php";
+require_once($IP .'/extensions/MobileFrontend/MobileFrontend.php');
 #!!! NEEDS REQUIRE !!!
 
 // Enable detection in PHP. Disable this if you put MW behind a caching layer
diff --git a/cookbooks/mediawiki/templates/default/mw-ext-TitleBlacklist.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-TitleBlacklist.inc.php.erb
index 6e6d7ed68..3a552eb10 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-TitleBlacklist.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-TitleBlacklist.inc.php.erb
@@ -1,6 +1,6 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
-wfLoadExtension( 'TitleBlacklist' );
+require_once($IP .'/extensions/TitleBlacklist/TitleBlacklist.php');
 $wgTitleBlacklistSources = array(
   array(
     'type' => TBLSRC_LOCALPAGE,
diff --git a/cookbooks/mediawiki/templates/default/mw-ext-VisualEditor.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-VisualEditor.inc.php.erb
index 88487844a..a36e5c25f 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-VisualEditor.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-VisualEditor.inc.php.erb
@@ -4,7 +4,7 @@ $wgVirtualRestConfig['modules']['parsoid'] = array(
 );
 $wgVirtualRestConfig['modules']['parsoid']['forwardCookies'] = true;
 
-require_once "$IP/extensions/VisualEditor/VisualEditor.php";
+require_once($IP .'/extensions/VisualEditor/VisualEditor.php');
 
 // Enable by default for everybody
 $wgDefaultUserOptions['visualeditor-enable'] = 1;
diff --git a/cookbooks/mediawiki/templates/default/mw-ext-cldr.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-cldr.inc.php.erb
index e1584febd..9fdda2ed1 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-cldr.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-cldr.inc.php.erb
@@ -1,3 +1,3 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
-require_once( $IP.'/extensions/cldr/cldr.php' );
+require_once($IP .'/extensions/cldr/cldr.php');
-- 
2.43.2