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 Tweaking of installer text to avoid misleading information about "exists" when there's actually an error (from r107366)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112396 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
sminnee 2010-10-15 01:16:09 +00:00
parent 8888693600
commit c402bb9eef
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
install.php
View File

@ -231,14 +231,14 @@ class InstallRequirements {
array( array(
"Database Configuration", "Database Configuration",
"Database support", "Database support",
"Database support not included in PHP.") "Database support in PHP")
) )
) { ) {
if($this->requireDatabaseServer( if($this->requireDatabaseServer(
$databaseConfig, $databaseConfig,
array( array(
"Database Configuration", "Database Configuration",
"Database server exists", "Database server",
"I couldn't find a database server on '$databaseConfig[server]'", "I couldn't find a database server on '$databaseConfig[server]'",
$databaseConfig['server'] $databaseConfig['server']
) )
@ -341,9 +341,9 @@ class InstallRequirements {
$this->getBaseDir() $this->getBaseDir()
)); ));
$this->requireFile('mysite', array("File permissions", "mysite/ folder exists", "There's no mysite folder.")); $this->requireFile('mysite', array("File permissions", "mysite/ folder exists?", "There's no mysite folder."));
$this->requireFile('sapphire', array("File permissions", "sapphire/ folder exists", "There's no sapphire folder.")); $this->requireFile('sapphire', array("File permissions", "sapphire/ folder exists?", "There's no sapphire folder."));
$this->requireFile('cms', array("File permissions", "cms/ folder exists", "There's no cms folder.")); $this->requireFile('cms', array("File permissions", "cms/ folder exists?", "There's no cms folder."));
if($isApache) { if($isApache) {
$this->requireWriteable('.htaccess', array("File permissions", "Is the .htaccess file writeable?", null)); $this->requireWriteable('.htaccess', array("File permissions", "Is the .htaccess file writeable?", null));
@ -767,7 +767,7 @@ class InstallRequirements {
$helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']); $helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']);
$result = $helper->requireDatabaseOrCreatePermissions($databaseConfig); $result = $helper->requireDatabaseOrCreatePermissions($databaseConfig);
if($result['success']) { if($result['success']) {
if($result['alreadyExists']) $testDetails[3] = "Database $databaseConfig[database] exists"; if($result['alreadyExists']) $testDetails[3] = "Database $databaseConfig[database]";
else $testDetails[3] = "Able to create a new database"; else $testDetails[3] = "Able to create a new database";
$this->testing($testDetails); $this->testing($testDetails);
return true; return true;