fix(controller): Preserve the id workspace

With array_merge, the id groupfolders erased the id workspace. It's fixed by reversing the values in the array_merge function. Signed-off-by: Baptiste Fotia <[email protected]>
arawa · Apr 29, 2024 · 1536262 · 1536262
1 parent d76c9ac
commit 1536262
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/Controller/WorkspaceController.php b/lib/Controller/WorkspaceController.php
@@ -185,11 +185,11 @@ public function findAll(): JSONResponse {
 		$spaces = [];
 		foreach ($workspaces as $workspace) {
 			$space = array_merge(
-				$workspace,
 				$this->folderHelper->getFolder(
 					$workspace['groupfolder_id'],
 					$this->rootFolder->getRootFolderStorageId()
-				)
+                ),
+                $workspace
 			);
 
 			$gids = array_keys($space['groups']);