summaryrefslogtreecommitdiffstats
path: root/lib/private/Files
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-05-15 12:43:25 -0500
committerGitHub <noreply@github.com>2017-05-15 12:43:25 -0500
commit91dfff5db4465c63b72daf3918f0750aa81e82e6 (patch)
tree4f827935df5347a9b8ac8b1bd8babc4dab4728a2 /lib/private/Files
parentad0d0b0916fef2826803c0641371efa0c7e91d64 (diff)
downloadnextcloud-server-91dfff5db4465c63b72daf3918f0750aa81e82e6.tar.gz
nextcloud-server-91dfff5db4465c63b72daf3918f0750aa81e82e6.zip
Revert "fix permissions of mountpoints - take 2"
Diffstat (limited to 'lib/private/Files')
-rw-r--r--lib/private/Files/View.php8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index 18942d05acf..0e22415e6f7 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -1355,12 +1355,8 @@ class View {
return false;
}
- if ($internalPath === '') {
- if ($mount instanceof MoveableMount) {
- $data['permissions'] = $data['permissions'] | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE;
- } else {
- $data['permissions'] = $data['permissions'] & (\OCP\Constants::PERMISSION_ALL - (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE));
- }
+ if ($mount instanceof MoveableMount && $internalPath === '') {
+ $data['permissions'] |= \OCP\Constants::PERMISSION_DELETE;
}
$owner = $this->getUserObjectForOwner($storage->getOwner($internalPath));