From d0a6dd09b9cd9d1c493c15adfd25b880f505e9af Mon Sep 17 00:00:00 2001
From: Grant Slater <git@firefishy.com>
Date: Sat, 2 Jan 2016 07:46:05 +0000
Subject: [PATCH] Update mediawiki to v1.26 branch

---
 cookbooks/mediawiki/providers/extension.rb    |  2 +-
 cookbooks/mediawiki/providers/site.rb         | 19 +++++++++++++++++--
 cookbooks/mediawiki/resources/site.rb         |  2 +-
 .../templates/default/LocalSettings.php.erb   |  1 -
 .../default/mw-ext-AbuseFilter.inc.php.erb    |  2 +-
 .../default/mw-ext-Babel.inc.php.erb          |  2 +-
 .../default/mw-ext-CheckUser.inc.php.erb      |  2 +-
 .../default/mw-ext-CirrusSearch.inc.php.erb   |  2 +-
 .../templates/default/mw-ext-Cite.inc.php.erb |  4 ----
 .../default/mw-ext-CleanChanges.inc.php.erb   |  2 +-
 .../default/mw-ext-ConfirmEdit.inc.php.erb    |  2 +-
 .../default/mw-ext-DisableAccount.inc.php.erb |  2 +-
 .../mw-ext-LocalisationUpdate.inc.php.erb     |  2 +-
 .../default/mw-ext-MobileFrontend.inc.php.erb |  2 +-
 .../mw-ext-ParserFunctions.inc.php.erb        |  2 +-
 .../default/mw-ext-PdfHandler.inc.php.erb     |  2 +-
 .../default/mw-ext-SpamBlacklist.inc.php.erb  |  2 +-
 .../default/mw-ext-TitleBlacklist.inc.php.erb |  2 +-
 18 files changed, 32 insertions(+), 22 deletions(-)
 delete mode 100644 cookbooks/mediawiki/templates/default/mw-ext-Cite.inc.php.erb

diff --git a/cookbooks/mediawiki/providers/extension.rb b/cookbooks/mediawiki/providers/extension.rb
index cb4cc5c84..33f7ad221 100644
--- a/cookbooks/mediawiki/providers/extension.rb
+++ b/cookbooks/mediawiki/providers/extension.rb
@@ -68,7 +68,7 @@ action :create do
 
     file "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.name}.inc.php" do
       action :create
-      content "<?php require_once('#{extension_script}');\n"
+      content "<?php wfLoadExtension( '#{new_resource.name}' );\n"
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       mode 0664
diff --git a/cookbooks/mediawiki/providers/site.rb b/cookbooks/mediawiki/providers/site.rb
index 0a72b203d..ad8454622 100644
--- a/cookbooks/mediawiki/providers/site.rb
+++ b/cookbooks/mediawiki/providers/site.rb
@@ -87,12 +87,21 @@ action :create do
 
   mediawiki_reference = "REL#{new_resource.version}".tr(".", "_")
 
+  git "#{mediawiki_directory}/vendor" do
+    action :nothing
+    repository "https://gerrit.wikimedia.org/r/p/mediawiki/vendor.git"
+    revision mediawiki_reference
+    user node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+  end
+
   git mediawiki_directory do
     action :sync
     repository "https://gerrit.wikimedia.org/r/p/mediawiki/core.git"
     revision mediawiki_reference
     user node[:mediawiki][:user]
     group node[:mediawiki][:group]
+    notifies :sync, "git[#{mediawiki_directory}/vendor]", :immediately
     notifies :run, "execute[#{mediawiki_directory}/maintenance/install.php]", :immediately
     notifies :run, "execute[#{mediawiki_directory}/maintenance/update.php]"
   end
@@ -182,7 +191,11 @@ action :create do
 
   mediawiki_extension "Cite" do
     site new_resource.name
-    template "mw-ext-Cite.inc.php.erb"
+    update_site false
+  end
+
+  mediawiki_extension "CiteThisPage" do
+    site new_resource.name
     update_site false
   end
 
@@ -244,6 +257,7 @@ action :create do
   mediawiki_extension "SimpleAntiSpam" do
     site new_resource.name
     update_site false
+    action :delete
   end
 
   mediawiki_extension "SpamBlacklist" do
@@ -270,7 +284,7 @@ action :create do
 
   # MediaWiki Language Extension Bundle
   # FIXME: should automatically resolve tag
-  mw_lang_ext_bundle_tag = "2015.08"
+  mw_lang_ext_bundle_tag = "2015.10"
 
   mediawiki_extension "Babel" do
     site new_resource.name
@@ -379,6 +393,7 @@ action :create do
   mediawiki_extension "Mantle" do
     site new_resource.name
     update_site false
+    action :delete
   end
 
   mediawiki_extension "MobileFrontend" do
diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index e7838ed0f..e56374b96 100644
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -23,7 +23,7 @@ default_action :create
 attribute :name, :kind_of => String, :name_attribute => true
 attribute :aliases, :kind_of => [String, Array]
 attribute :directory, :kind_of => String
-attribute :version, :kind_of => String, :default => "1.24"
+attribute :version, :kind_of => String, :default => "1.26"
 attribute :database_name, :kind_of => String, :required => true
 attribute :database_user, :kind_of => String, :required => true
 attribute :database_password, :kind_of => String, :required => true
diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index d61e1bb3d..85151cfdf 100644
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -12,7 +12,6 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 $wgSitename      = '<%= @mediawiki[:sitename] %>';
 $wgMetaNamespace = '<%= @mediawiki[:metanamespace] %>';
 
-
 ## The URL base path to the directory containing the wiki;
 ## defaults for all runtime URL paths are based off of this.
 ## For more information on customizing the URLs
diff --git a/cookbooks/mediawiki/templates/default/mw-ext-AbuseFilter.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-AbuseFilter.inc.php.erb
index 4528b2230..4c9216ac0 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-AbuseFilter.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-AbuseFilter.inc.php.erb
@@ -1,6 +1,6 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
-require_once($IP .'/extensions/AbuseFilter/AbuseFilter.php');
+wfLoadExtension( 'AbuseFilter' );
 $wgGroupPermissions['sysop']['abusefilter-modify'] = true;
 $wgGroupPermissions['*']['abusefilter-log-detail'] = true;
 $wgGroupPermissions['*']['abusefilter-view'] = true;
diff --git a/cookbooks/mediawiki/templates/default/mw-ext-Babel.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-Babel.inc.php.erb
index e0617c46e..99295163d 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-Babel.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-Babel.inc.php.erb
@@ -1,6 +1,6 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
-require_once( $IP.'/extensions/Babel/Babel.php' );
+wfLoadExtension( 'Babel' );
 $wgBabelMainCategory = 'User %code%';
 $wgBabelCategoryNames = array(
         '0' => false,
diff --git a/cookbooks/mediawiki/templates/default/mw-ext-CheckUser.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-CheckUser.inc.php.erb
index 0f738689c..e4762efce 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-CheckUser.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-CheckUser.inc.php.erb
@@ -1,6 +1,6 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
-require_once($IP .'/extensions/CheckUser/CheckUser.php');
+wfLoadExtension( 'CheckUser' );
 
 #Only allow bureaucrat group to checkuser
 $wgGroupPermissions['bureaucrat']['checkuser'] = true;
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..ddb87f166 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' );
+wfLoadExtension( 'CirrusSearch' );
 $wgDisableSearchUpdate = false;
 $wgSearchType = 'CirrusSearch';
diff --git a/cookbooks/mediawiki/templates/default/mw-ext-Cite.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-Cite.inc.php.erb
deleted file mode 100644
index 73f7d324d..000000000
--- a/cookbooks/mediawiki/templates/default/mw-ext-Cite.inc.php.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-# DO NOT EDIT - This file is being maintained by Chef
-require_once( $IP.'/extensions/Cite/Cite.php' );
-require_once( $IP.'/extensions/Cite/SpecialCite.php' );
diff --git a/cookbooks/mediawiki/templates/default/mw-ext-CleanChanges.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-CleanChanges.inc.php.erb
index 786f0a42d..74d9cafcc 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-CleanChanges.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-CleanChanges.inc.php.erb
@@ -1,4 +1,4 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
 $wgDefaultUserOptions['usenewrc'] = 1;
-require_once( $IP.'/extensions/CleanChanges/CleanChanges.php' );
+wfLoadExtension( 'CleanChanges' );
diff --git a/cookbooks/mediawiki/templates/default/mw-ext-ConfirmEdit.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-ConfirmEdit.inc.php.erb
index 9af53d723..56e0b640a 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-ConfirmEdit.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-ConfirmEdit.inc.php.erb
@@ -1,6 +1,6 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
-require_once( $IP.'/extensions/ConfirmEdit/ReCaptcha.php' );
+wfLoadExtensions( array( 'ConfirmEdit', 'ConfirmEdit/ReCaptcha' ) );
 $wgCaptchaClass = 'ReCaptcha';
 $recaptcha_public_key = '<%= @public_key %>';
 $recaptcha_private_key = '<%= @private_key %>';
diff --git a/cookbooks/mediawiki/templates/default/mw-ext-DisableAccount.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-DisableAccount.inc.php.erb
index 7d0b2f4de..dd7bdb8eb 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-DisableAccount.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-DisableAccount.inc.php.erb
@@ -1,6 +1,6 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
-require_once( $IP.'/extensions/DisableAccount/DisableAccount.php' );
+wfLoadExtension( 'DisableAccount' );
 
 // Allow bureaucrats to disable users
 $wgGroupPermissions['bureaucrat']['disableaccount'] = true;
diff --git a/cookbooks/mediawiki/templates/default/mw-ext-LocalisationUpdate.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-LocalisationUpdate.inc.php.erb
index 4ad0b4817..236d80297 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-LocalisationUpdate.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-LocalisationUpdate.inc.php.erb
@@ -1,4 +1,4 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
-require_once( $IP.'/extensions/LocalisationUpdate/LocalisationUpdate.php' );
+wfLoadExtension( 'LocalisationUpdate' );
 $wgLocalisationUpdateDirectory = $IP.'/cache';
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 01c4ffdb0..dc906efea 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-MobileFrontend.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-MobileFrontend.inc.php.erb
@@ -1,6 +1,6 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
-require_once( $IP.'/extensions/MobileFrontend/MobileFrontend.php' );
+wfLoadExtension( 'MobileFrontend' );
 
 // Enable detection in PHP. Disable this if you put MW behind a caching layer
 $wgMFAutodetectMobileView = true;
diff --git a/cookbooks/mediawiki/templates/default/mw-ext-ParserFunctions.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-ParserFunctions.inc.php.erb
index 2deafb105..dcd60ecc7 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-ParserFunctions.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-ParserFunctions.inc.php.erb
@@ -1,4 +1,4 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
-require_once( $IP.'/extensions/ParserFunctions/ParserFunctions.php' );
+wfLoadExtension( 'ParserFunctions' );
 $wgPFEnableStringFunctions = true;
diff --git a/cookbooks/mediawiki/templates/default/mw-ext-PdfHandler.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-PdfHandler.inc.php.erb
index c34488991..c92564114 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-PdfHandler.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-PdfHandler.inc.php.erb
@@ -1,5 +1,5 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
-require_once($IP .'/extensions/PdfHandler/PdfHandler.php');
+wfLoadExtension( 'PdfHandler' );
 #Disable due to MW Exception
 #$wgPdfCreateThumbnailsInJobQueue = true;
diff --git a/cookbooks/mediawiki/templates/default/mw-ext-SpamBlacklist.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-SpamBlacklist.inc.php.erb
index 35b2834aa..f9178ad86 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-SpamBlacklist.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-SpamBlacklist.inc.php.erb
@@ -1,7 +1,7 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
 ini_set( 'pcre.backtrack_limit', '16M' );
-require_once( $IP.'/extensions/SpamBlacklist/SpamBlacklist.php' );
+wfLoadExtension( 'SpamBlacklist' );
 $wgSpamBlacklistFiles = array(
 	'http://meta.wikimedia.org/w/index.php?title=Spam_blacklist&action=raw&sb_ver=1'
 );
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 df595fe28..6e6d7ed68 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
-require_once( $IP.'/extensions/TitleBlacklist/TitleBlacklist.php' );
+wfLoadExtension( 'TitleBlacklist' );
 $wgTitleBlacklistSources = array(
   array(
     'type' => TBLSRC_LOCALPAGE,
-- 
2.39.5