From 19050a38dce565b3262fffcdd314066014b3b1e6 Mon Sep 17 00:00:00 2001 From: sminnee Date: Fri, 15 Oct 2010 01:14:48 +0000 Subject: [PATCH] BUGFIX Installer now checks the database version AFTER it has determined a connection can be established, which some databases require first BUGFIX Database version check failures are now a warning, so a user can install at their own risk (from r104793) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112389 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- install.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/install.php b/install.php index 62d8029..2e4b4b4 100644 --- a/install.php +++ b/install.php @@ -236,20 +236,20 @@ class InstallRequirements { $databaseConfig['server'] ) )) { - if($this->requireDatabaseVersion( + if($this->requireDatabaseConnection( $databaseConfig, array( "Database Configuration", - "Database server meets required version", - "Database does not meet the required version" + "Database access credentials correct", + "That username/password doesn't work" ) )) { - if($this->requireDatabaseConnection( + if($this->requireDatabaseVersion( $databaseConfig, array( "Database Configuration", - "Database access credentials correct", - "That username/password doesn't work" + "Database server meets required version", + "Database does not meet the required version" ) )) { $this->requireDatabaseOrCreatePermissions( @@ -734,7 +734,7 @@ class InstallRequirements { return true; } else { $testDetails[2] .= ": " . $result['error']; - $this->error($testDetails); + $this->warning($testDetails); return false; } }