From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 1 Sep 2010 17:46:07 +0000 (+0000)
Subject: Skip install entirely if we did an upgrade
X-Git-Tag: 1.31.0-rc.0~35244
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=ede00a1707f41b56858693fbd6e5c0769016abb0;p=lhc%2Fweb%2Fwiklou.git

Skip install entirely if we did an upgrade
---

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index dbbfcb8e02..9d93f9511b 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -831,6 +831,8 @@ class WebInstaller_Install extends WebInstallerPage {
 			$status = new Status();
 			$status->warning( 'config-install-alreadydone' );
 			$this->parent->showStatusBox( $status );
+		} elseif( $this->getVar( '_UpgradeDone' ) ) {
+			return 'skip';
 		} else {
 			$this->startForm();
 			$this->addHTML("<ul>");