Bump 1.20alpha

[lhc/web/wiklou.git] / maintenance / update.php

diff --git a/maintenance/update.php b/maintenance/update.php
index e4e874e..c4bf3b2 100644 (file)
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -43,6 +43,7 @@ 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( 'force', 'Override when $wgAllowSchemaUpdates disables this script' );
        }
 
        function getDbType() {
@@ -75,13 +76,21 @@ class UpdateMediaWiki extends Maintenance {
        }
 
        function execute() {
-               global $wgVersion, $wgTitle, $wgLang;
+               global $wgVersion, $wgTitle, $wgLang, $wgAllowSchemaUpdates;
+
+               if( !$wgAllowSchemaUpdates && !$this->hasOption( 'force' ) ) {
+                       $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 );
+               }
 
                $wgLang = Language::factory( 'en' );
                $wgTitle = Title::newFromText( "MediaWiki database updater" );
 
                $this->output( "MediaWiki {$wgVersion} Updater\n\n" );
 
+               wfWaitForSlaves( 5 ); // let's not kill databases, shall we? ;) --tor
+
                if ( !$this->hasOption( 'skip-compat-checks' ) ) {
                        $this->compatChecks();
                } else {
@@ -102,14 +111,22 @@ class UpdateMediaWiki extends Maintenance {
                }
 
                $shared = $this->hasOption( 'doshared' );
-               $purge = !$this->hasOption( 'nopurge' );
+
+               $updates = array( 'core', 'extensions', 'stats' );
+               if( !$this->hasOption('nopurge') ) {
+                       $updates[] = 'purge';
+               }
 
                $updater = DatabaseUpdater::newForDb( $db, $shared, $this );
-               $updater->doUpdates( $purge );
+               $updater->doUpdates( $updates );
 
                foreach( $updater->getPostDatabaseUpdateMaintenance() as $maint ) {
+                       if ( $updater->updateRowExists( $maint ) ) {
+                               continue;
+                       }
                        $child = $this->runChild( $maint );
                        $child->execute();
+                       $updater->insertUpdateRow( $maint );
                }
 
                $this->output( "\nDone.\n" );