From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 14 Jan 2015 15:44:30 +0000 (+0100)
Subject: Small cleanup of rename code
X-Git-Tag: v8.1.0alpha1~15^2~11
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b302592a6435b4f9bf18719b04314d9f463d54da;p=nextcloud-server.git

Small cleanup of rename code
---

diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index ab7a7d3db9a..475a9d35af1 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -616,26 +616,26 @@ class View {
 			}
 			if ($run) {
 				$this->verifyPath(dirname($path2), basename($path2));
-
-				$mp1 = $this->getMountPoint($path1 . $postFix1);
-				$mp2 = $this->getMountPoint($path2 . $postFix2);
-				$manager = Filesystem::getMountManager();
-				$mount = $manager->find($absolutePath1 . $postFix1);
-				$storage1 = $mount->getStorage();
-				$internalPath1 = $mount->getInternalPath($absolutePath1 . $postFix1);
-				list($storage2, $internalPath2) = Filesystem::resolvePath($absolutePath2 . $postFix2);
-				if ($internalPath1 === '' and $mount instanceof MoveableMount) {
+				
+				$mount1 = $this->getMount($path1);
+				$mount2 = $this->getMount($path2);
+				$storage1 = $mount1->getStorage();
+				$storage2 = $mount1->getStorage();
+				$internalPath1 = $mount1->getInternalPath($absolutePath1);
+				$internalPath2 = $mount2->getInternalPath($absolutePath2);
+
+				if ($internalPath1 === '' and $mount1 instanceof MoveableMount) {
 					if ($this->isTargetAllowed($absolutePath2)) {
 						/**
-						 * @var \OC\Files\Mount\MountPoint | \OC\Files\Mount\MoveableMount $mount
+						 * @var \OC\Files\Mount\MountPoint | \OC\Files\Mount\MoveableMount $mount1
 						 */
-						$sourceMountPoint = $mount->getMountPoint();
-						$result = $mount->moveMount($absolutePath2);
-						$manager->moveMount($sourceMountPoint, $mount->getMountPoint());
+						$sourceMountPoint = $mount1->getMountPoint();
+						$result = $mount1->moveMount($absolutePath2);
+						$manager->moveMount($sourceMountPoint, $mount1->getMountPoint());
 					} else {
 						$result = false;
 					}
-				} elseif ($mp1 == $mp2) {
+				} elseif ($storage1 == $storage2) {
 					if ($storage1) {
 						$result = $storage1->rename($internalPath1, $internalPath2);
 					} else {