Update to MediaWiki 1.20.2

this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024

2 files changed, 67 insertions, 4 deletions

diff --git a/mw-config/index.php b/mw-config/index.php
index c65be69c..065d1879 100644
--- a/mw-config/index.php
+++ b/mw-config/index.php
@@ -8,11 +8,11 @@
 define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' );
 define( 'MEDIAWIKI_INSTALL', true );
 
-chdir( dirname( dirname( __FILE__ ) ) );
+chdir( dirname( __DIR__ ) );
 if ( isset( $_SERVER['MW_COMPILED'] ) ) {
-	require ( 'phase3/includes/WebStart.php' );
+	require ( 'core/includes/WebStart.php' );
 } else {
-	require( dirname( dirname( __FILE__ ) ) . '/includes/WebStart.php' );
+	require( dirname( __DIR__ ) . '/includes/WebStart.php' );
 }
 
 wfInstallerMain();
@@ -20,7 +20,7 @@ wfInstallerMain();
 function wfInstallerMain() {
 	global $wgRequest, $wgLang, $wgMetaNamespace, $wgCanonicalNamespaceNames;
 
-	$installer = new WebInstaller( $wgRequest );
+	$installer = InstallerOverrides::getWebInstaller( $wgRequest );
 
 	if ( !$installer->startSession() ) {
 		$installer->finish();
diff --git a/mw-config/overrides.php b/mw-config/overrides.php
new file mode 100644
index 00000000..ae982951
--- /dev/null
+++ b/mw-config/overrides.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * MediaWiki installer overrides.
+ * Modify this file if you are a packager who needs to modify the behavior of the MediaWiki installer.
+ * Altering it is preferred over changing anything in /includes.
+ *
+ * Note: this file doesn't gets included from a global scope, don't use globals directly.
+ */
+
+/*
+
+Example of modifications:
+
+	public static function getLocalSettingsGenerator( Installer $installer ) {
+		return new MyLocalSettingsGenerator( $installer );
+	}
+
+Then add the following to the bottom of this file:
+
+class MyLocalSettingsGenerator extends LocalSettingsGenerator {
+	function getText() {
+		// Modify an existing setting
+		$this->values['wgResourceLoaderMaxQueryLength'] = 512;
+		// add a new setting
+		$ls = parent::getText();
+		return $ls . "\n\$wgUseTex = true;\n";
+	}
+}
+*/
+
+/**
+ * @since 1.20
+ */
+class InstallerOverrides {
+	/**
+	 * Instantiates and returns an instance of LocalSettingsGenerator or its descendant classes
+	 * @param Installer $installer
+	 * @return LocalSettingsGenerator
+	 */
+	public static function getLocalSettingsGenerator( Installer $installer ) {
+		return new LocalSettingsGenerator( $installer );
+	}
+
+	/**
+	 * Instantiates and returns an instance of WebInstaller or its descendant classes
+	 * @param WebRequest $request
+	 * @return WebInstaller
+	 */
+	public static function getWebInstaller( WebRequest $request ) {
+		return new WebInstaller( $request );
+	}
+
+	/**
+	 * Instantiates and returns an instance of CliInstaller or its descendant classes
+	 * @param string $siteName
+	 * @param string|null $admin
+	 * @param array $options
+	 * @return CliInstaller
+	 */
+	public static function getCliInstaller( $siteName, $admin = null, array $options = array() ) {
+		return new CliInstaller( $siteName, $admin, $options );
+	}
+}