From 5431eca6be0dd3fe8275966b67eb0f7e2893a85b Mon Sep 17 00:00:00 2001 From: Git'Fellow <12234510+solracsf@users.noreply.github.com> Date: Mon, 27 Nov 2023 15:46:17 +0100 Subject: [PATCH 1/2] Retunr empty array if no user is found Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com> --- lib/Versions/VersionsBackend.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Versions/VersionsBackend.php b/lib/Versions/VersionsBackend.php index c79fe1631..7a215ed7c 100644 --- a/lib/Versions/VersionsBackend.php +++ b/lib/Versions/VersionsBackend.php @@ -23,6 +23,7 @@ namespace OCA\GroupFolders\Versions; +use OC\User\NoUserException; use OCA\Files_Versions\Versions\IDeletableVersionBackend; use OCA\Files_Versions\Versions\INameableVersionBackend; use OCA\Files_Versions\Versions\INeedSyncVersionBackend; @@ -118,9 +119,10 @@ public function getVersionsForFile(IUser $user, FileInfo $fileInfo): array { } return $this->getVersionsForFileFromDB($file, $user, $folderId); - } catch (NotFoundException $e) { + } catch (NoUserException | NotFoundException $e) { return []; } + } /** From 0157d8eef01fb71c35054caa47b4c92f0af5d231 Mon Sep 17 00:00:00 2001 From: Git'Fellow <12234510+solracsf@users.noreply.github.com> Date: Mon, 27 Nov 2023 16:35:44 +0100 Subject: [PATCH 2/2] Fix Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com> --- lib/Versions/VersionsBackend.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/Versions/VersionsBackend.php b/lib/Versions/VersionsBackend.php index 7a215ed7c..70fddbf80 100644 --- a/lib/Versions/VersionsBackend.php +++ b/lib/Versions/VersionsBackend.php @@ -23,7 +23,6 @@ namespace OCA\GroupFolders\Versions; -use OC\User\NoUserException; use OCA\Files_Versions\Versions\IDeletableVersionBackend; use OCA\Files_Versions\Versions\INameableVersionBackend; use OCA\Files_Versions\Versions\INeedSyncVersionBackend; @@ -66,6 +65,11 @@ public function getVersionsForFile(IUser $user, FileInfo $fileInfo): array { return []; } + $userFolder = $this->rootFolder->getUserFolder($user->getUID()); + if (!$userFolder) { + return []; + } + try { $folderId = $mount->getFolderId(); /** @var Folder $versionsFolder */ @@ -119,7 +123,7 @@ public function getVersionsForFile(IUser $user, FileInfo $fileInfo): array { } return $this->getVersionsForFileFromDB($file, $user, $folderId); - } catch (NoUserException | NotFoundException $e) { + } catch (NotFoundException $e) { return []; }