Revert r54244 which was stupid and fix this properly. Require commandLine.inc/Mainten...

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

diff --git a/maintenance/update.php b/maintenance/update.php
index ccb21bc..c473153 100644 (file)
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -2,36 +2,45 @@
 /**
  * Run all updaters.
  *
+ * This is used when the database schema is modified and we need to apply patches.
+ *
+ * @file
  * @todo document
- * @package MediaWiki
- * @subpackage Maintenance
+ * @ingroup Maintenance
  */
 
 /** */
-$options = array( 'quick' );
-require_once( "commandLine.inc" );
-require_once( "updaters.inc" );
+$wgUseMasterForMaintenance = true;
+require_once( dirname(__FILE__) . '/commandLine.inc' );
+require( "updaters.inc" );
+
+# Don't try to load stuff from l10n_cache yet
+$lc = Language::getLocalisationCache();
+$lc->disableBackend();
+
 $wgTitle = Title::newFromText( "MediaWiki database updater" );
-$dbclass = 'Database'.ucfirst($wgDBtype);
-require_once("$dbclass.php");
-$dbc = new $dbclass;
-$wgDatabase = $dbc->newFromParams( $wgDBserver, $wgDBadminuser, $wgDBadminpassword, $wgDBname );
 
-print "Going to run database updates for $wgDBname\n";
+echo( "MediaWiki {$wgVersion} Updater\n\n" );
+
+install_version_checks();
+
+# Attempt to connect to the database as a privileged user
+# This will vomit up an error if there are permissions problems
+$wgDatabase = wfGetDB( DB_MASTER );
+
+print "Going to run database updates for ".wfWikiID()."\n";
 print "Depending on the size of your database this may take a while!\n";
 
 if( !isset( $options['quick'] ) ) {
        print "Abort with control-c in the next five seconds... ";
-
-       for ($i = 5; $i >= 0; --$i) {
-               echo $i;
-               sleep(1);
-               echo( ($i == 0) ? "\n" : chr(8) );
-       }
+       wfCountDown( 5 );
 }
 
-do_all_updates();
+$shared = isset( $options['doshared'] );
+$purge = !isset( $options['nopurge'] );
+
+do_all_updates( $shared, $purge );
 
 print "Done.\n";
 
-?>
+