summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2017-08-15 10:19:15 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2017-08-16 21:17:26 +0200
commit82791b7b064a00cc1dc8364ed727900e62167af8 (patch)
treef58d6e42cbe6a53bc3ad2bb5666d7bc319f7a0da /apps/files_sharing
parentfff192f78fa9672648ffb1226b682e685f784c5a (diff)
downloadnextcloud-server-82791b7b064a00cc1dc8364ed727900e62167af8.tar.gz
nextcloud-server-82791b7b064a00cc1dc8364ed727900e62167af8.zip
Public upload share permission handling
If you set the permissions on a public share the SHARE permission makes no sense. So instead of throwing a warning. Just filter out the share permission. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/lib/Controller/ShareAPIController.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php
index c57a738457e..8f65c1c559c 100644
--- a/apps/files_sharing/lib/Controller/ShareAPIController.php
+++ b/apps/files_sharing/lib/Controller/ShareAPIController.php
@@ -700,6 +700,7 @@ class ShareAPIController extends OCSController {
if ($permissions !== null) {
$newPermissions = (int)$permissions;
+ $newPermissions = $newPermissions & ~\OCP\Constants::PERMISSION_SHARE;
}
if ($newPermissions !== null &&