From 1941f1b1a8b0f0ba9350875f21b090eb2c315d63 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Tue, 17 Nov 2020 14:20:02 +0100 Subject: [PATCH] Revert "[stable20] circleId too short in some request" --- apps/files_sharing/lib/Controller/ShareAPIController.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index aaca16b32e..2c2ec393d3 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) {