Moving between storages is not a rename

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Author: rullzer

lib/private/Files/Storage/Wrapper/Encryption.php

@@ -624,7 +624,7 @@ public function moveFromStorage(Storage\IStorage $sourceStorage, $sourceInternal
 			return false;
 		}
 
-		$result = $this->copyBetweenStorage($sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime, true);
+		$result = $this->copyBetweenStorage($sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime, false);
 		if ($result) {
 			if ($sourceStorage->is_dir($sourceInternalPath)) {
 				$result &= $sourceStorage->rmdir($sourceInternalPath);
@@ -1022,7 +1022,7 @@ protected function shouldEncrypt($path) {
 		}
 
 		try {
-			$encryptionModule = $this->getEncryptionModule($fullPath);
+			$encryptionModule = $this->getEncryptionModule($path);
 		} catch (ModuleDoesNotExistsException $e) {
 			return false;
 		}