diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2020-11-17 14:20:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 14:20:02 +0100 |
| commit | 1941f1b1a8b0f0ba9350875f21b090eb2c315d63 (patch) | |
| tree | af000c61e13d940c49e7b9d83d046f8f2bcf612d | |
| parent | f06f9a91b3f29891fd7aae0b5a3b19f1f9b7690f (diff) | |
| download | nextcloud-server-1941f1b1a8b0f0ba9350875f21b090eb2c315d63.tar.gz nextcloud-server-1941f1b1a8b0f0ba9350875f21b090eb2c315d63.zip | |
Revert "[stable20] circleId too short in some request"
| -rw-r--r-- | apps/files_sharing/lib/Controller/ShareAPIController.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index aaca16b32e6..2c2ec393d3f 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -1648,11 +1648,10 @@ class ShareAPIController extends OCSController { $hasCircleId = (substr($share->getSharedWith(), -1) === ']'); $shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0); $shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' ')); - if ($shareWithLength === false) { - $sharedWith = substr($share->getSharedWith(), $shareWithStart); - } else { - $sharedWith = substr($share->getSharedWith(), $shareWithStart, $shareWithLength); + if (is_bool($shareWithLength)) { + $shareWithLength = -1; } + $sharedWith = substr($share->getSharedWith(), $shareWithStart, $shareWithLength); try { $member = \OCA\Circles\Api\v1\Circles::getMember($sharedWith, $userId, 1); if ($member->getLevel() >= 4) { |