Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MINOR Renamed keys to database configuration results (from r98795)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112103 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information...
commit c4de1cb3be26638f4aca2314cfc62da61f3a6e1a 1 parent 6368a4f
sminnee authored
Showing with 5 additions and 5 deletions.
  1. +5 −5 install.php
View
10 install.php
@@ -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 @@ function requireDatabaseConnection($databaseConfig, $testDetails) {
$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 @@ function requireDatabaseServer($databaseConfig, $testDetails) {
$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 @@ function requireDatabaseOrCreatePermissions($databaseConfig, $testDetails) {
$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;
Please sign in to comment.
Something went wrong with that request. Please try again.