Merge pull request #18883 from owncloud/encryption-move-same-storage

use a normal rename when moving from the same storage in the encryption wrapper
This commit is contained in:
Thomas Müller 2015-10-05 22:02:33 +02:00
commit 0577eed14e
1 changed files with 3 additions and 0 deletions

View File

@ -424,6 +424,9 @@ class Encryption extends Wrapper {
* @return bool
*/
public function moveFromStorage(Storage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = true) {
if ($sourceStorage === $this) {
return $this->rename($sourceInternalPath, $targetInternalPath);
}
// TODO clean this up once the underlying moveFromStorage in OC\Files\Storage\Wrapper\Common is fixed:
// - call $this->storage->moveFromStorage() instead of $this->copyBetweenStorage