diff options
Diffstat (limited to 'lib/private/Config.php')
| -rw-r--r-- | lib/private/Config.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/Config.php b/lib/private/Config.php index 3cff3ca960d..4b7497decd9 100644 --- a/lib/private/Config.php +++ b/lib/private/Config.php @@ -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; |