diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-06-27 18:23:00 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-06-27 18:23:00 +0200 |
| commit | 6670d3765881a1a7579bd96a523a90c2a52aec4a (patch) | |
| tree | 4251976f5699d7b9e0b1b0aa42b3a5baca5432b5 /lib/private/Share20 | |
| parent | cee2f5dc65f743e0e6470e852978d8bb8e346012 (diff) | |
| parent | f8fa031e9f81ba052930d2de647d997af3c309c6 (diff) | |
| download | nextcloud-server-6670d3765881a1a7579bd96a523a90c2a52aec4a.tar.gz nextcloud-server-6670d3765881a1a7579bd96a523a90c2a52aec4a.zip | |
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
Diffstat (limited to 'lib/private/Share20')
| -rw-r--r-- | lib/private/Share20/Manager.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index 478643e939b..9383255bc73 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -452,14 +452,9 @@ class Manager implements IManager { throw new \InvalidArgumentException('Link shares can\'t have reshare permissions'); } - // We don't allow deletion on link shares - if ($share->getPermissions() & \OCP\Constants::PERMISSION_DELETE) { - throw new \InvalidArgumentException('Link shares can\'t have delete permissions'); - } - // Check if public upload is allowed if (!$this->shareApiLinkAllowPublicUpload() && - ($share->getPermissions() & (\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE))) { + ($share->getPermissions() & (\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE))) { throw new \InvalidArgumentException('Public upload not allowed'); } } |