From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 maintenance/update.php | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

(limited to 'maintenance/update.php')

diff --git a/maintenance/update.php b/maintenance/update.php
index f69a9b0d..378217fd 100644
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -26,12 +26,12 @@
  */
 
 if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.3.2' ) < 0 ) ) {
-	require( dirname( __FILE__ ) . '/../includes/PHPVersionError.php' );
+	require dirname( __FILE__ ) . '/../includes/PHPVersionError.php';
 	wfPHPVersionError( 'cli' );
 }
 
 $wgUseMasterForMaintenance = true;
-require_once( __DIR__ . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
 /**
  * Maintenance script to run database schema updates.
@@ -83,7 +83,7 @@ class UpdateMediaWiki extends Maintenance {
 	function execute() {
 		global $wgVersion, $wgTitle, $wgLang, $wgAllowSchemaUpdates;
 
-		if( !$wgAllowSchemaUpdates && !( $this->hasOption( 'force' ) || $this->hasOption( 'schema' ) || $this->hasOption( 'noschema' ) ) ) {
+		if ( !$wgAllowSchemaUpdates && !( $this->hasOption( 'force' ) || $this->hasOption( 'schema' ) || $this->hasOption( 'noschema' ) ) ) {
 			$this->error( "Do not run update.php on this wiki. If you're seeing this you should\n"
 				. "probably ask for some help in performing your schema updates or use\n"
 				. "the --noschema and --schema options to get an SQL file for someone\n"
@@ -92,12 +92,12 @@ class UpdateMediaWiki extends Maintenance {
 		}
 
 		$this->fileHandle = null;
-		if( substr( $this->getOption( 'schema' ), 0, 2 ) === "--" ) {
+		if ( substr( $this->getOption( 'schema' ), 0, 2 ) === "--" ) {
 			$this->error( "The --schema option requires a file as an argument.\n", true );
-		} else if( $this->hasOption( 'schema' ) ) {
+		} elseif ( $this->hasOption( 'schema' ) ) {
 			$file = $this->getOption( 'schema' );
 			$this->fileHandle = fopen( $file, "w" );
-			if( $this->fileHandle === false ) {
+			if ( $this->fileHandle === false ) {
 				$err = error_get_last();
 				$this->error( "Problem opening the schema file for writing: $file\n\t{$err['message']}", true );
 			}
@@ -122,7 +122,7 @@ class UpdateMediaWiki extends Maintenance {
 		$db = wfGetDB( DB_MASTER );
 
 		$this->output( "Going to run database updates for " . wfWikiID() . "\n" );
-		if( $db->getType() === 'sqlite' ) {
+		if ( $db->getType() === 'sqlite' ) {
 			$this->output( "Using SQLite file: '{$db->mDatabaseFile}'\n" );
 		}
 		$this->output( "Depending on the size of your database this may take a while!\n" );
@@ -135,21 +135,17 @@ class UpdateMediaWiki extends Maintenance {
 		$shared = $this->hasOption( 'doshared' );
 
 		$updates = array( 'core', 'extensions' );
-		if( !$this->hasOption('schema') ) {
-			if( $this->hasOption('noschema') ) {
+		if ( !$this->hasOption( 'schema' ) ) {
+			if ( $this->hasOption( 'noschema' ) ) {
 				$updates[] = 'noschema';
 			}
 			$updates[] = 'stats';
-
-			if( !$this->hasOption('nopurge') ) {
-				$updates[] = 'purge';
-			}
 		}
 
 		$updater = DatabaseUpdater::newForDb( $db, $shared, $this );
 		$updater->doUpdates( $updates );
 
-		foreach( $updater->getPostDatabaseUpdateMaintenance() as $maint ) {
+		foreach ( $updater->getPostDatabaseUpdateMaintenance() as $maint ) {
 			$child = $this->runChild( $maint );
 
 			// LoggedUpdateMaintenance is checking the updatelog itself
@@ -159,14 +155,13 @@ class UpdateMediaWiki extends Maintenance {
 				continue;
 			}
 
-			$child = $this->runChild( $maint );
 			$child->execute();
 			if ( !$isLoggedUpdate ) {
 				$updater->insertUpdateRow( $maint );
 			}
 		}
 
-		if( !$this->hasOption('nopurge') ) {
+		if ( !$this->hasOption( 'nopurge' ) ) {
 			$updater->purgeCache();
 		}
 
@@ -189,4 +184,4 @@ class UpdateMediaWiki extends Maintenance {
 }
 
 $maintClass = 'UpdateMediaWiki';
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;
-- 
cgit v1.2.2