diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2015-07-23 15:18:59 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2015-07-23 15:18:59 +0200 |
| commit | 9cee8ff9f8729c22030c9c5b59e13dfd5796c956 (patch) | |
| tree | 30eb5dfd9e17ff83ddff68bea29d3c94148e0a92 /lib/private/files/storage | |
| parent | 9ccf94ca06806ad5312d3ac06b8b25388f3ec5f4 (diff) | |
| download | nextcloud-server-9cee8ff9f8729c22030c9c5b59e13dfd5796c956.tar.gz nextcloud-server-9cee8ff9f8729c22030c9c5b59e13dfd5796c956.zip | |
Only set is encrypted when encryption is enabled
Diffstat (limited to 'lib/private/files/storage')
| -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 |