Merge pull request #1055 from arawa/fix/workspace-inconsistency-crash

Merge groupfolders if it exists
arawa · Sep 6, 2024 · 960c015 · 960c015
2 parents d32ecb5 + 31b4eb1
commit 960c015
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/lib/Controller/WorkspaceController.php b/lib/Controller/WorkspaceController.php
@@ -186,15 +186,16 @@ public function findAll(): JSONResponse {
 		$workspaces = $this->workspaceService->getAll();
 		$spaces = [];
 		foreach ($workspaces as $workspace) {
-			$space = array_merge(
-				$this->folderHelper->getFolder(
-					$workspace['groupfolder_id'],
-					$this->rootFolder->getRootFolderStorageId()
-				),
-				$workspace
+			$folderInfo = $this->folderHelper->getFolder(
+				$workspace['groupfolder_id'],
+				$this->rootFolder->getRootFolderStorageId()
 			);
+			$space = ($folderInfo !== false) ? array_merge(
+				$folderInfo,
+				$workspace
+			) : $workspace;
 
-			$gids = array_keys($space['groups']);
+			$gids = array_keys($space['groups'] ?? []);
 			$groups = array_map(fn ($gid) => $this->groupManager->get($gid), $gids);
 
 			$space['groups'] = GroupFormatter::formatGroups($groups);