diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-07-21 23:10:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-21 23:10:50 +0200 |
| commit | 655c26224be56ef284f9032cfe70ad026d5c62b1 (patch) | |
| tree | 71007e4a512cbd7ad396f885512b46b46eef2695 | |
| parent | 50fc5a1e2524724549ac2cbeefe64a4692dbda77 (diff) | |
| parent | 359a583186c9e992b95b79966365f43305ccc4d2 (diff) | |
| download | nextcloud-server-655c26224be56ef284f9032cfe70ad026d5c62b1.tar.gz nextcloud-server-655c26224be56ef284f9032cfe70ad026d5c62b1.zip | |
Merge pull request #5596 from nextcloud/mount-rename
Fix renaming of non-renamble mounts
| -rw-r--r-- | core/js/files/client.js | 5 | ||||
| -rw-r--r-- | lib/private/Files/View.php | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/core/js/files/client.js b/core/js/files/client.js index d8e615f6d6d..176cabf04b1 100644 --- a/core/js/files/client.js +++ b/core/js/files/client.js @@ -331,11 +331,10 @@ case 'C': case 'K': data.permissions |= OC.PERMISSION_CREATE; - if (!isFile) { - data.permissions |= OC.PERMISSION_UPDATE; - } break; case 'W': + case 'N': + case 'V': data.permissions |= OC.PERMISSION_UPDATE; break; case 'D': diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index c384d07c037..71b453d299a 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -770,14 +770,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; } |