diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-11-12 17:29:56 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-11-12 17:29:56 +0100 |
| commit | 6e3a8416520e93b6a6b5ec38bda269aa6bfe38c3 (patch) | |
| tree | 4fcb0bf2e2ca41774554da230b9507b6bcfe8dfd /lib | |
| parent | d5796bbaf9fdcd21ed7de6489972ef0993993ccf (diff) | |
| parent | 49ddaf9489d3c9ce75f965dcbacf7e8017a84e08 (diff) | |
| download | nextcloud-server-6e3a8416520e93b6a6b5ec38bda269aa6bfe38c3.tar.gz nextcloud-server-6e3a8416520e93b6a6b5ec38bda269aa6bfe38c3.zip | |
Merge pull request #12139 from owncloud/DoNotTouchMe
Try to read the file only instead of trying to touch
Diffstat (limited to 'lib')
| -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 f0548442ab5..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($file === $this->configFilePath && !@touch($file)) { - // 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)) { |