Skip to content

Commit

Permalink
ENHANCEMENT "Database Configuration" section in installer shows datab…
Browse files Browse the repository at this point in the history
…ase version and database type (without the "Database" suffix) for reference (from r111874)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112430 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information
sminnee committed Oct 15, 2010
1 parent 3df7734 commit 5dc52e9
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions install.php
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,9 @@ function checkDatabase($databaseConfig) {
array(
"Database Configuration",
"Database support",
"Database support in PHP")
"Database support in PHP"
)
) {
)) {
if($this->requireDatabaseServer(
$databaseConfig,
array(
Expand All @@ -257,7 +257,8 @@ function checkDatabase($databaseConfig) {
array(
"Database Configuration",
"Database server meets required version",
""
'',
$this->getDatabaseTypeNice($databaseConfig['type']) . ' ' . $this->getDatabaseConfigurationHelper($databaseConfig['type'])->getDatabaseVersion($databaseConfig)
)
)) {
$this->requireDatabaseOrCreatePermissions(
Expand Down Expand Up @@ -697,7 +698,11 @@ function requireIISRewriteModule($moduleName, $testDetails) {
return false;
}
}


function getDatabaseTypeNice($databaseClass) {
return substr($databaseClass, 0, -8);
}

/**
* Get an instance of a helper class for the specific database.
* @param string $databaseClass e.g. MySQLDatabase or MSSQLDatabase
Expand Down

0 comments on commit 5dc52e9

Please sign in to comment.