diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-01-27 14:16:40 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-01-27 14:16:40 +0100 |
| commit | 4d90fd933f47c71b4b9ff333b223f06822bc5340 (patch) | |
| tree | ebe8b44a8b2470acde36975e89512999ce646174 /lib/private | |
| parent | a870dbe70b0951ebfaad0c56657bf518e4634d74 (diff) | |
| parent | 17f2cfbb9c6edeeab3e29718209eb88946335d55 (diff) | |
| download | nextcloud-server-4d90fd933f47c71b4b9ff333b223f06822bc5340.tar.gz nextcloud-server-4d90fd933f47c71b4b9ff333b223f06822bc5340.zip | |
Merge pull request #13699 from owncloud/check-if-file-exists
Use `file_exists` to verify that config file exists
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/config.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/config.php b/lib/private/config.php index 586e8c20587..31e536221dd 100644 --- a/lib/private/config.php +++ b/lib/private/config.php @@ -166,7 +166,9 @@ class Config { // Include file and merge config foreach ($configFiles as $file) { $filePointer = @fopen($file, 'r'); - if($file === $this->configFilePath && $filePointer === false) { + if($file === $this->configFilePath && + $filePointer === false && + @!file_exists($this->configFilePath)) { // Opening the main config might not be possible, e.g. if the wrong // permissions are set (likely on a new installation) continue; |