Update mediawiki to v1.26 branch

diff --git a/cookbooks/mediawiki/providers/extension.rb b/cookbooks/mediawiki/providers/extension.rb
index cb4cc5c84b3670edde1267887c6c4109fc721c0a..33f7ad221f06b9f8b35456d074a34c89f289f025 100644 (file)
--- 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
 
     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
       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 0a72b203d232b1b4b9af18794991de09ef9a959b..ad845462295855d021d89b9477688c52df3479dc 100644 (file)
--- 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(".", "_")
 
 
   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]
   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
     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
 
   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
 
     update_site false
   end
 


@@ -244,6 +257,7 @@ action :create do
   mediawiki_extension "SimpleAntiSpam" do
     site new_resource.name
     update_site false
   mediawiki_extension "SimpleAntiSpam" do
     site new_resource.name
     update_site false

+    action :delete

   end
 
   mediawiki_extension "SpamBlacklist" do
   end
 
   mediawiki_extension "SpamBlacklist" do


@@ -270,7 +284,7 @@ action :create do
 
   # MediaWiki Language Extension Bundle
   # FIXME: should automatically resolve tag
 
   # 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
 
   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
   mediawiki_extension "Mantle" do
     site new_resource.name
     update_site false

+    action :delete

   end
 
   mediawiki_extension "MobileFrontend" do
   end
 
   mediawiki_extension "MobileFrontend" do

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index e7838ed0feb952c410c012da75fdc669f1e6d750..e56374b9630a9242223de13f20933ef7198c12d1 100644 (file)
--- 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 :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
 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 d61e1bb3dec667dd68307ed2f42165adc3afd09c..85151cfdf7d754c3ed110daee4042c1433b751d8 100644 (file)
--- 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] %>';
 
 $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
 ## 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 4528b22304308a77846359eea6af538ed25d9141..4c9216ac0d9b9cd7a7510734671593ea841f09e6 100644 (file)
--- 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
 <?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;
 $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 e0617c46ea2fd5e7a2937e5b65821cfb7a252c7a..99295163d1653a7af9604414b6bd610fb01e0eac 100644 (file)
--- 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
 <?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,
 $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 0f738689cf4ce65d88625fad6f982ca16f50ff99..e4762efce286a5961a412d8d7bee8ab357616aae 100644 (file)
--- 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
 <?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;
 
 #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 87c817c58a184192b10faf67dec659930b7b1f58..ddb87f166eb3d755f92d597498c95ee347204b6a 100644 (file)
--- 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
 <?php
 # DO NOT EDIT - This file is being maintained by Chef

-require_once( $IP.'/extensions/CirrusSearch/CirrusSearch.php' );
+wfLoadExtension( 'CirrusSearch' );

 $wgDisableSearchUpdate = false;
 $wgSearchType = '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 (file)
index 73f7d32..0000000
--- 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 786f0a42d0c21d2700201f794af2d739eade68e7..74d9cafccd329e4841ba2039c9b1adf9c079940e 100644 (file)
--- 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;
 <?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 9af53d723c4cd7de94ad71cb49123d4e2922e66b..56e0b640a83fa220a7191c17542c627d7d74aadf 100644 (file)
--- 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
 <?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 %>';
 $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 7d0b2f4de11be06e2f47c251ba32fc25f6f1ab2c..dd7bdb8eb7cc35e8b0fd4786c9b08d9bddf8d261 100644 (file)
--- 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
 <?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;
 
 // 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 4ad0b4817ef9b78c8277c6aee5846a682ba4da87..236d80297f973b7cbf536096b97fcf9a793eedb6 100644 (file)
--- 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
 <?php
 # DO NOT EDIT - This file is being maintained by Chef

-require_once( $IP.'/extensions/LocalisationUpdate/LocalisationUpdate.php' );
+wfLoadExtension( 'LocalisationUpdate' );

 $wgLocalisationUpdateDirectory = $IP.'/cache';
 $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 01c4ffdb07ea83d1132261ab8f6bce84ef404f75..dc906efea5d6ec9f8a4a6be6d3548162080b712a 100644 (file)
--- 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
 <?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;
 
 // 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 2deafb105e9b3fc7e6f1ec9015bbead2f5e5bd50..dcd60ecc7bcc3f1f91b0d16958d4d08f460a6a5b 100644 (file)
--- 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
 <?php
 # DO NOT EDIT - This file is being maintained by Chef

-require_once( $IP.'/extensions/ParserFunctions/ParserFunctions.php' );
+wfLoadExtension( 'ParserFunctions' );

 $wgPFEnableStringFunctions = true;
 $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 c34488991888e6716572f4afe6755c9b78f30628..c925641145a3195c702d339a2e8a2392ad5a2080 100644 (file)
--- 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
 <?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;
 #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 35b2834aad144a01aa245b5914418f982e0744f0..f9178ad86de4d843fb70603633fc3f2b1be00ecc 100644 (file)
--- 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' );
 <?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'
 );
 $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 df595fe28d5a37a1fbdba3a7cbdb538e46f1f51b..6e6d7ed686b4986ed5dbb8febeabab9d36e54e00 100644 (file)
--- 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
 <?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,
 $wgTitleBlacklistSources = array(
   array(
     'type' => TBLSRC_LOCALPAGE,