diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-11-12 15:56:02 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-11-25 14:40:52 +0100 |
| commit | d815638f7b086fad627dbbd22c10a068acfcae6c (patch) | |
| tree | 1723ce256286f14530a550d0780f3961f71182bb | |
| parent | 384d1892aa1a0d2aef61ed1fb9f704a106675ed3 (diff) | |
| download | nextcloud-server-d815638f7b086fad627dbbd22c10a068acfcae6c.tar.gz nextcloud-server-d815638f7b086fad627dbbd22c10a068acfcae6c.zip | |
Try to read the file only instead of trying to touch
The permissions are already catched properly on the installation so we just have to check whether the file is readable to prevent fatal errors from happening.
Fixes https://github.com/owncloud/core/issues/12135
Conflicts:
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 7bf3863e2a6..cc07d6a1ed1 100644 --- a/lib/private/config.php +++ b/lib/private/config.php @@ -138,12 +138,12 @@ class Config { // Include file and merge config foreach ($configFiles as $file) { - if(!@touch($file) && $file === $this->configFilePath) { - // Writing to the main config might not be possible, e.g. if the wrong + $filePointer = @fopen($file, 'r'); + if($file === $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; } - $filePointer = fopen($file, 'r'); // Try to acquire a file lock if(!flock($filePointer, LOCK_SH)) { |