mirror of
https://github.com/silverstripe/silverstripe-installer
synced 2024-10-01 05:39:14 +02:00
ENHANCEMENT "Database Configuration" section in installer shows database 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
This commit is contained in:
parent
3df7734b83
commit
5dc52e9569
11
install.php
11
install.php
@ -232,9 +232,9 @@ class InstallRequirements {
|
|||||||
array(
|
array(
|
||||||
"Database Configuration",
|
"Database Configuration",
|
||||||
"Database support",
|
"Database support",
|
||||||
"Database support in PHP")
|
"Database support in PHP"
|
||||||
)
|
)
|
||||||
) {
|
)) {
|
||||||
if($this->requireDatabaseServer(
|
if($this->requireDatabaseServer(
|
||||||
$databaseConfig,
|
$databaseConfig,
|
||||||
array(
|
array(
|
||||||
@ -257,7 +257,8 @@ class InstallRequirements {
|
|||||||
array(
|
array(
|
||||||
"Database Configuration",
|
"Database Configuration",
|
||||||
"Database server meets required version",
|
"Database server meets required version",
|
||||||
""
|
'',
|
||||||
|
$this->getDatabaseTypeNice($databaseConfig['type']) . ' ' . $this->getDatabaseConfigurationHelper($databaseConfig['type'])->getDatabaseVersion($databaseConfig)
|
||||||
)
|
)
|
||||||
)) {
|
)) {
|
||||||
$this->requireDatabaseOrCreatePermissions(
|
$this->requireDatabaseOrCreatePermissions(
|
||||||
@ -698,6 +699,10 @@ class InstallRequirements {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getDatabaseTypeNice($databaseClass) {
|
||||||
|
return substr($databaseClass, 0, -8);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get an instance of a helper class for the specific database.
|
* Get an instance of a helper class for the specific database.
|
||||||
* @param string $databaseClass e.g. MySQLDatabase or MSSQLDatabase
|
* @param string $databaseClass e.g. MySQLDatabase or MSSQLDatabase
|
||||||
|
Loading…
Reference in New Issue
Block a user