Merge pull request #185 from nextcloud/fix-permission-issue

Show error message if config file is not readable
This commit is contained in:
Lukas Reschke 2016-06-21 12:14:24 +02:00 committed by GitHub
commit 097cba8b38
1 changed files with 3 additions and 3 deletions

View File

@ -184,10 +184,10 @@ class Config {
// Include file and merge config
foreach ($configFiles as $file) {
$filePointer = file_exists($file) ? fopen($file, 'r') : false;
$fileExistsAndIsReadable = file_exists($file) && is_readable($file);
$filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
if($file === $this->configFilePath &&
$filePointer === false &&
@!file_exists($this->configFilePath)) {
$filePointer === false) {
// Opening the main config might not be possible, e.g. if the wrong
// permissions are set (likely on a new installation)
continue;