Skip install entirely if we did an upgrade

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index dbbfcb8..9d93f95 100644 (file)
--- 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>");