mirror of
https://github.com/silverstripe/silverstripe-installer
synced 2024-10-22 17:05:33 +02:00
BUGFIX Fixed conflicting check of mysite directory with recommendation of removal of _config.php in installer (from r115169)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@115170 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
88aea2f456
commit
b13c561c51
@ -589,7 +589,7 @@ class InstallRequirements {
|
|||||||
if(!file_exists($path)) {
|
if(!file_exists($path)) {
|
||||||
$testDetails[2] .= " Directory '$path' not found. Please make sure you have uploaded the SilverStripe files to your webserver correctly.";
|
$testDetails[2] .= " Directory '$path' not found. Please make sure you have uploaded the SilverStripe files to your webserver correctly.";
|
||||||
$this->error($testDetails);
|
$this->error($testDetails);
|
||||||
} elseif(!file_exists($path . '/_config.php')) {
|
} elseif(!file_exists($path . '/_config.php') && $dirname != 'mysite') {
|
||||||
$testDetails[2] .= " Directory '$path' exists, but is missing files. Please make sure you have uploaded the SilverStripe files to your webserver correctly.";
|
$testDetails[2] .= " Directory '$path' exists, but is missing files. Please make sure you have uploaded the SilverStripe files to your webserver correctly.";
|
||||||
$this->error($testDetails);
|
$this->error($testDetails);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user