non movable mounts can not be moved

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index 0e22415e6f735a6de31b0534b81946e330886f27..bc16511bdab06021911142caf841c0adc9d0fc2c 100644 (file)
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -779,14 +779,18 @@ class View {
                                $this->changeLock($path1, ILockingProvider::LOCK_EXCLUSIVE, true);
                                $this->changeLock($path2, ILockingProvider::LOCK_EXCLUSIVE, true);
 
-                               if ($internalPath1 === '' and $mount1 instanceof MoveableMount) {
-                                       if ($this->isTargetAllowed($absolutePath2)) {
-                                               /**
-                                                * @var \OC\Files\Mount\MountPoint | \OC\Files\Mount\MoveableMount $mount1
-                                                */
-                                               $sourceMountPoint = $mount1->getMountPoint();
-                                               $result = $mount1->moveMount($absolutePath2);
-                                               $manager->moveMount($sourceMountPoint, $mount1->getMountPoint());
+                               if ($internalPath1 === '') {
+                                       if ($mount1 instanceof MoveableMount) {
+                                               if ($this->isTargetAllowed($absolutePath2)) {
+                                                       /**
+                                                        * @var \OC\Files\Mount\MountPoint | \OC\Files\Mount\MoveableMount $mount1
+                                                        */
+                                                       $sourceMountPoint = $mount1->getMountPoint();
+                                                       $result = $mount1->moveMount($absolutePath2);
+                                                       $manager->moveMount($sourceMountPoint, $mount1->getMountPoint());
+                                               } else {
+                                                       $result = false;
+                                               }
                                        } else {
                                                $result = false;
                                        }