Merge pull request #7842 from open-sausages/pulls/4/fix-installer-public-search

BUG Fix installer checking wrong location for files
This commit is contained in:
Chris Joe 2018-02-08 10:26:54 +13:00 committed by GitHub
commit e0e8ca0ee6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -282,7 +282,8 @@ class InstallRequirements
'', '',
)); ));
$this->requireWriteable('index.php', array("File permissions", "Is the index.php file writeable?", null));
$this->requireWriteable($this->getPublicDir() . 'index.php', array("File permissions", "Is the index.php file writeable?", null), true);
$this->requireWriteable('.env', ["File permissions", "Is the .env file writeable?", null], false, false); $this->requireWriteable('.env', ["File permissions", "Is the .env file writeable?", null], false, false);
@ -293,9 +294,9 @@ class InstallRequirements
"SilverStripe requires Apache version 2 or greater", "SilverStripe requires Apache version 2 or greater",
$webserver $webserver
)); ));
$this->requireWriteable('.htaccess', array("File permissions", "Is the .htaccess file writeable?", null)); $this->requireWriteable($this->getPublicDir() . '.htaccess', array("File permissions", "Is the .htaccess file writeable?", null), true);
} elseif ($isIIS) { } elseif ($isIIS) {
$this->requireWriteable('web.config', array("File permissions", "Is the web.config file writeable?", null)); $this->requireWriteable($this->getPublicDir() . 'web.config', array("File permissions", "Is the web.config file writeable?", null), true);
} }
$this->requireWriteable('mysite/_config.php', array( $this->requireWriteable('mysite/_config.php', array(