tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-10-22 17:05:33 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Installer now checks the database version AFTER it has determined a connection can be established, which some databases require first

Browse Source 
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
This commit is contained in:
sminnee 2010-10-15 01:14:48 +00:00
parent 30b46e866a
commit 19050a38dc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
install.php
View File

@ -235,14 +235,6 @@ class InstallRequirements {
"I couldn't find a database server on '$databaseConfig[server]'",
$databaseConfig['server']
)
)) {
if($this->requireDatabaseVersion(
$databaseConfig,
array(
"Database Configuration",
"Database server meets required version",
"Database does not meet the required version"
)
)) {
if($this->requireDatabaseConnection(
$databaseConfig,
@ -251,6 +243,14 @@ class InstallRequirements {
"Database access credentials correct",
"That username/password doesn't work"
)
)) {
if($this->requireDatabaseVersion(
$databaseConfig,
array(
"Database Configuration",
"Database server meets required version",
"Database does not meet the required version"
)
)) {
$this->requireDatabaseOrCreatePermissions(
$databaseConfig,
@ -734,7 +734,7 @@ class InstallRequirements {
return true;
} else {
$testDetails[2] .= ": " . $result['error'];
$this->error($testDetails);
$this->warning($testDetails);
return false;
}
}