From 0678de8be417bc62788c7eea5b2fc76265a6f53e Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Fri, 25 Mar 2011 19:06:24 +0000
Subject: [PATCH] Partial revert r78593 (adding --upgrade option to
 install.php). Rather than supporting the added complexity in the installer,
 just bail and tell them to run update.php, since they obviously have command
 line access :)

---
 includes/installer/CliInstaller.php   |  7 +------
 includes/installer/Installer.i18n.php |  2 +-
 maintenance/install.php               | 11 +++++++----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php
index bfa6e8aa20..c6b78d9fe2 100644
--- a/includes/installer/CliInstaller.php
+++ b/includes/installer/CliInstaller.php
@@ -31,9 +31,6 @@ class CliInstaller extends Installer {
 		'dbschema' => 'wgDBmwschema',
 		'dbpath' => 'wgSQLiteDataDir',
 		'scriptpath' => 'wgScriptPath',
-		'upgrade' => 'cliUpgrade', /* As long as it isn't $confItems
-									* in LocalSettingsGenerator, we
-									* should be fine. */
 	);
 
 	/**
@@ -91,10 +88,8 @@ class CliInstaller extends Installer {
 	 * Main entry point.
 	 */
 	public function execute() {
-		global $cliUpgrade;
-
 		$vars = $this->getExistingLocalSettings();
-		if( $vars && ( !isset( $cliUpgrade ) || $cliUpgrade !== "yes" )  ) {
+		if( $vars ) {
 			$this->showStatusMessage(
 				Status::newFatal( "config-localsettings-cli-upgrade" )
 			);
diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index b243afdf18..e49b8a2d03 100644
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -19,7 +19,7 @@ $messages['en'] = array(
 To upgrade this installation, please enter the value of <code>\$wgUpgradeKey</code> in the box below.
 You will find it in LocalSettings.php.",
 	'config-localsettings-cli-upgrade'    => 'A LocalSettings.php file has been detected.
-To upgrade this installation, please give the --upgrade=yes option.',
+To upgrade this installation, please run update.php instead',
 	'config-localsettings-key'        => 'Upgrade key:',
 	'config-localsettings-badkey'     => 'The key you provided is incorrect.',
 	'config-upgrade-key-missing'      => 'An existing installation of MediaWiki has been detected.
diff --git a/maintenance/install.php b/maintenance/install.php
index 5504ed3b3e..e782be9f4f 100644
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -50,12 +50,8 @@ class CommandLineInstaller extends Maintenance {
 		$this->addOption( 'dbpass', 'The pasword for the DB user for normal operations', false, true );
 		$this->addOption( 'confpath', "Path to write LocalSettings.php to, default $IP", false, true );
 		/* $this->addOption( 'dbschema', 'The schema for the MediaWiki DB in pg (mediawiki)', false, true ); */
-		/* $this->addOption( 'dbtsearch2schema', 'The schema for the tsearch2 DB in pg (public)', false, true ); */
 		/* $this->addOption( 'namespace', 'The project namespace (same as the name)', false, true ); */
 		$this->addOption( 'env-checks', "Run environment checks only, don't change anything" );
-		$this->addOption( 'upgrade',
-			'Allow the upgrade to continue despite an existing LocalSettings.php', false, true );
-
 	}
 
 	public function execute() {
@@ -76,6 +72,13 @@ class CommandLineInstaller extends Maintenance {
 				return;
 			}
 		} else {
+			$status = $installer->doEnvironmentChecks();
+			if( $status->isGood() ) {
+				$installer->showMessage( 'config-env-good' );
+			} else {
+				$installer->showStatusMessage( $status );
+				return;
+			}
 			$installer->execute();
 			$installer->writeConfigurationFile( $this->getOption( 'confpath', $IP ) );
 		}
-- 
2.20.1