Only set is encrypted when encryption is enabled

owncloud · Jul 23, 2015 · 9cee8ff · 9cee8ff
1 parent 9ccf94c
commit 9cee8ff
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
@@ -521,7 +521,7 @@ private function copyBetweenStorage(Storage $sourceStorage, $sourceInternalPath,
 				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