Update to MediaWiki 1.21.1

1 files changed, 48 insertions, 12 deletions

diff --git a/maintenance/update.php b/maintenance/update.php
index 877f1366..f69a9b0d 100644
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -26,9 +26,8 @@
  */
 
 if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.3.2' ) < 0 ) ) {
-	echo "You are using PHP version " . phpversion() . " but MediaWiki needs PHP 5.3.2 or higher. ABORTING.\n" .
-	"Check if you have a newer php executable with a different name, such as php5.\n";
-	die( 1 );
+	require( dirname( __FILE__ ) . '/../includes/PHPVersionError.php' );
+	wfPHPVersionError( 'cli' );
 }
 
 $wgUseMasterForMaintenance = true;
@@ -40,7 +39,6 @@ require_once( __DIR__ . '/Maintenance.php' );
  * @ingroup Maintenance
  */
 class UpdateMediaWiki extends Maintenance {
-
 	function __construct() {
 		parent::__construct();
 		$this->mDescription = "MediaWiki database updater";
@@ -48,6 +46,8 @@ class UpdateMediaWiki extends Maintenance {
 		$this->addOption( 'quick', 'Skip 5 second countdown before starting' );
 		$this->addOption( 'doshared', 'Also update shared tables' );
 		$this->addOption( 'nopurge', 'Do not purge the objectcache table after updates' );
+		$this->addOption( 'noschema', 'Only do the updates that are not done during schema updates' );
+		$this->addOption( 'schema', 'Output SQL to do the schema updates instead of doing them.  Works even when $wgAllowSchemaUpdates is false', false, true );
 		$this->addOption( 'force', 'Override when $wgAllowSchemaUpdates disables this script' );
 	}
 
@@ -83,10 +83,24 @@ class UpdateMediaWiki extends Maintenance {
 	function execute() {
 		global $wgVersion, $wgTitle, $wgLang, $wgAllowSchemaUpdates;
 
-		if( !$wgAllowSchemaUpdates && !$this->hasOption( 'force' ) ) {
+		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.\n\n"
-				. "If you know what you are doing, you can continue with --force", true );
+				. "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"
+				. "else to inspect and run.\n\n"
+				. "If you know what you are doing, you can continue with --force\n", true );
+		}
+
+		$this->fileHandle = null;
+		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' ) ) {
+			$file = $this->getOption( 'schema' );
+			$this->fileHandle = fopen( $file, "w" );
+			if( $this->fileHandle === false ) {
+				$err = error_get_last();
+				$this->error( "Problem opening the schema file for writing: $file\n\t{$err['message']}", true );
+			}
 		}
 
 		$wgLang = Language::factory( 'en' );
@@ -108,6 +122,9 @@ class UpdateMediaWiki extends Maintenance {
 		$db = wfGetDB( DB_MASTER );
 
 		$this->output( "Going to run database updates for " . wfWikiID() . "\n" );
+		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" );
 
 		if ( !$this->hasOption( 'quick' ) ) {
@@ -117,21 +134,40 @@ class UpdateMediaWiki extends Maintenance {
 
 		$shared = $this->hasOption( 'doshared' );
 
-		$updates = array( 'core', 'extensions', 'stats' );
-		if( !$this->hasOption('nopurge') ) {
-			$updates[] = 'purge';
+		$updates = array( 'core', 'extensions' );
+		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 ) {
-			if ( $updater->updateRowExists( $maint ) ) {
+			$child = $this->runChild( $maint );
+
+			// LoggedUpdateMaintenance is checking the updatelog itself
+			$isLoggedUpdate = is_a( $child, 'LoggedUpdateMaintenance' );
+
+			if ( !$isLoggedUpdate && $updater->updateRowExists( $maint ) ) {
 				continue;
 			}
+
 			$child = $this->runChild( $maint );
 			$child->execute();
-			$updater->insertUpdateRow( $maint );
+			if ( !$isLoggedUpdate ) {
+				$updater->insertUpdateRow( $maint );
+			}
+		}
+
+		if( !$this->hasOption('nopurge') ) {
+			$updater->purgeCache();
 		}
 
 		$this->output( "\nDone.\n" );