(bug 18122) Fix fatal require() errors and typo in the README.

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

diff --git a/maintenance/update.php b/maintenance/update.php
index 5c0d574..3f48413 100644 (file)
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -3,23 +3,47 @@ require_once 'counter.php';
 /**
  * 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
  */
 
 /** */
 $wgUseMasterForMaintenance = true;
-$options = array( 'quick' );
+$options = array( 'quick', 'nopurge' );
 require_once( "commandLine.inc" );
 require_once( "updaters.inc" );
 $wgTitle = Title::newFromText( "MediaWiki database updater" );
-$dbclass = 'Database'.ucfirst($wgDBtype);
-require_once("$dbclass.php");
-$dbc = new $dbclass;
-$wgDatabase = $dbc->newFromParams( $wgDBserver, $wgDBadminuser, $wgDBadminpassword, $wgDBname );
+$dbclass = 'Database' . ucfirst( $wgDBtype ) ;
+
+echo( "MediaWiki {$wgVersion} Updater\n\n" );
+
+install_version_checks();
+
+# Do a pre-emptive check to ensure we've got credentials supplied
+# We can't, at this stage, check them, but we can detect their absence,
+# which seems to cause most of the problems people whinge about
+if( !isset( $wgDBadminuser ) || !isset( $wgDBadminpassword ) ) {
+       echo( "No superuser credentials could be found. Please provide the details\n" );
+       echo( "of a user with appropriate permissions to update the database. See\n" );
+       echo( "AdminSettings.sample for more details.\n\n" );
+       exit();
+}
 
-print "Going to run database updates for $wgDBname\n";
+# Attempt to connect to the database as a privileged user
+# This will vomit up an error if there are permissions problems
+$wgDatabase = new $dbclass( $wgDBserver, $wgDBadminuser, $wgDBadminpassword, $wgDBname, 1 );
+
+if( !$wgDatabase->isOpen() ) {
+       # Appears to have failed
+       echo( "A connection to the database could not be established. Check the\n" );
+       echo( "values of \$wgDBadminuser and \$wgDBadminpassword.\n" );
+       exit();
+}
+
+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'] ) ) {
@@ -32,14 +56,11 @@ if( !isset( $options['quick'] ) ) {
        echo "\n";
 }
 
-if ( isset( $options['doshared'] ) ) {
-       $doShared = true;
-} else {
-       $doShared = false;
-}
+$shared = isset( $options['doshared'] );
+$purge = !isset( $options['nopurge'] );
 
-do_all_updates( $doShared );
+do_all_updates( $shared, $purge );
 
 print "Done.\n";
 
-?>
+