From 5dc52e95694ad5dc51a26790b20c29c5decb706a Mon Sep 17 00:00:00 2001
From: sminnee <sminnee@467b73ca-7a2a-4603-9d3b-597d59a354a9>
Date: Fri, 15 Oct 2010 01:22:04 +0000
Subject: [PATCH] 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
---
 install.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/install.php b/install.php
index 70bad02..7e5d7e5 100644
--- a/install.php
+++ b/install.php
@@ -232,9 +232,9 @@ class InstallRequirements {
 			array(
 				"Database Configuration",
 				"Database support",
-				"Database support in PHP")
+				"Database support in PHP"
 			)
-		) {
+		)) {
 			if($this->requireDatabaseServer(
 				$databaseConfig,
 				array(
@@ -257,7 +257,8 @@ class InstallRequirements {
 						array(
 							"Database Configuration",
 							"Database server meets required version",
-							""
+							'',
+							$this->getDatabaseTypeNice($databaseConfig['type']) . ' ' . $this->getDatabaseConfigurationHelper($databaseConfig['type'])->getDatabaseVersion($databaseConfig)
 						)
 					)) {
 						$this->requireDatabaseOrCreatePermissions(
@@ -697,7 +698,11 @@ class InstallRequirements {
 			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