diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-11-03 21:20:42 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-11-03 21:20:42 +0100 |
| commit | 7f1d97479698a6794adc8c83b18bdefd5e30bf35 (patch) | |
| tree | a0433a4824252f16a3420c57cbc7c745c1dc77cb | |
| parent | d2276215a475062c781f57d80f912f421f4b69fe (diff) | |
| parent | 9790801268e4afee5277870993fb190431c5b706 (diff) | |
| download | nextcloud-server-7f1d97479698a6794adc8c83b18bdefd5e30bf35.tar.gz nextcloud-server-7f1d97479698a6794adc8c83b18bdefd5e30bf35.zip | |
Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfig
First check whether it is the default config before touching
| -rw-r--r-- | lib/private/config.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/config.php b/lib/private/config.php index 7bf3863e2a6..f0548442ab5 100644 --- a/lib/private/config.php +++ b/lib/private/config.php @@ -138,7 +138,7 @@ class Config { // Include file and merge config foreach ($configFiles as $file) { - if(!@touch($file) && $file === $this->configFilePath) { + if($file === $this->configFilePath && !@touch($file)) { // Writing to the main config might not be possible, e.g. if the wrong // permissions are set (likely on a new installation) continue; |