diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-07-27 16:06:39 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-07-27 16:06:39 +0200 |
| commit | 68f14a943acb7b2f51a4f717cd043f2ac2d4def8 (patch) | |
| tree | 327cfa7a504b5196b08a483899b25e3c3e0c535e /lib | |
| parent | c030ae9decd1558a7ececf1dcbc556c293d00ea2 (diff) | |
| parent | 5923270004ac0b74ab464dd8c058c59628c960b0 (diff) | |
| download | nextcloud-server-68f14a943acb7b2f51a4f717cd043f2ac2d4def8.tar.gz nextcloud-server-68f14a943acb7b2f51a4f717cd043f2ac2d4def8.zip | |
Merge pull request #17840 from owncloud/fix-enc-wrapper-without-encryption
Only set is encrypted when encryption is enabled
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/files/storage/wrapper/encryption.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php index 61290791faa..af3d14082c4 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/files/storage/wrapper/encryption.php @@ -521,7 +521,7 @@ class Encryption extends Wrapper { if ($preserveMtime) { $this->touch($targetInternalPath, $sourceStorage->filemtime($sourceInternalPath)); } - $isEncrypted = $this->mount->getOption('encrypt', true) ? 1 : 0; + $isEncrypted = $this->encryptionManager->isEnabled() && $this->mount->getOption('encrypt', true) ? 1 : 0; // in case of a rename we need to manipulate the source cache because // this information will be kept for the new target |