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

MINOR Renamed keys to database configuration results

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98795 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
sharvey 2010-02-11 09:58:46 +00:00 committed by Sam Minnee
parent 0d54c89476
commit 6429b0b103
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
install.php
View File

@ -216,7 +216,7 @@ class InstallRequirements {
var $errors, $warnings, $tests;
/**
* Just check that the database configuration is okay
* Just check that the database configuration is all good.
*/
function checkdatabase($databaseConfig) {
if($this->requireDatabaseFunctions(
@ -629,7 +629,7 @@ class InstallRequirements {
$this->testing($testDetails);
$helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']);
$result = $helper->requireDatabaseConnection($databaseConfig);
if($result['okay']) {
if($result['success']) {
return true;
} else {
$testDetails[2] .= ": " . $result['error'];
@ -642,7 +642,7 @@ class InstallRequirements {
$this->testing($testDetails);
$helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']);
$result = $helper->requireDatabaseServer($databaseConfig);
if($result['okay']) {
if($result['success']) {
return true;
} else {
$testDetails[2] .= ": " . $result['error'];
@ -655,8 +655,8 @@ class InstallRequirements {
$this->testing($testDetails);
$helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']);
$result = $helper->requireDatabaseOrCreatePermissions($databaseConfig);
if($result['okay']) {
if($result['existsAlready']) $testDetails[3] = "Database $databaseConfig[database] exists";
if($result['success']) {
if($result['alreadyExists']) $testDetails[3] = "Database $databaseConfig[database] exists";
else $testDetails[3] = "Able to create a new database";
$this->testing($testDetails);
return true;