From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 mw-config/index.php     | 10 ++++------
 mw-config/overrides.php |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'mw-config')

diff --git a/mw-config/index.php b/mw-config/index.php
index a6cebc39..be811dc9 100644
--- a/mw-config/index.php
+++ b/mw-config/index.php
@@ -20,12 +20,10 @@
  * @file
  */
 
-// Bail if PHP is too low
-if ( !function_exists( 'version_compare' ) || version_compare( PHP_VERSION, '5.3.2' ) < 0 ) {
-	// We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+
-	require dirname( dirname( __FILE__ ) ) . '/includes/PHPVersionError.php';
-	wfPHPVersionError( 'mw-config/index.php' );
-}
+// Bail on old versions of PHP, or if composer has not been run yet to install
+// dependencies. Using dirname( __FILE__ ) here because __DIR__ is PHP5.3+.
+require_once dirname( __FILE__ ) . '/../includes/PHPVersionCheck.php';
+wfEntryPointCheck( 'mw-config/index.php' );
 
 define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' );
 define( 'MEDIAWIKI_INSTALL', true );
diff --git a/mw-config/overrides.php b/mw-config/overrides.php
index 57581525..40b3ddee 100644
--- a/mw-config/overrides.php
+++ b/mw-config/overrides.php
@@ -38,7 +38,7 @@ Then add the following to the bottom of this file:
 class MyLocalSettingsGenerator extends LocalSettingsGenerator {
 	function getText() {
 		// Modify an existing setting
-		$this->values['wgResourceLoaderMaxQueryLength'] = 512;
+		$this->values['wgDefaultSkin'] = 'vector';
 		// add a new setting
 		$ls = parent::getText();
 		return $ls . "\n\$wgUseTex = true;\n";
-- 
cgit v1.2.2