From 224779c33f7ff27648a6d130918c0e7f662e1ed8 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Mon, 1 Jul 2024 15:01:29 +0200 Subject: fix(TaskProcessingApiController): Don't use + to merge non-assoc. arrays Signed-off-by: Marcel Klehr --- core/Controller/TaskProcessingApiController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/Controller/TaskProcessingApiController.php') diff --git a/core/Controller/TaskProcessingApiController.php b/core/Controller/TaskProcessingApiController.php index 383a6d7a31a..0128dc9ffc0 100644 --- a/core/Controller/TaskProcessingApiController.php +++ b/core/Controller/TaskProcessingApiController.php @@ -285,7 +285,7 @@ class TaskProcessingApiController extends \OCP\AppFramework\OCSController { /** @var int|list $inputSlot */ $inputSlot = $task->getInput()[$key]; if (is_array($inputSlot)) { - $ids += $inputSlot; + $ids = array_merge($inputSlot, $ids); } else { $ids[] = $inputSlot; } @@ -297,14 +297,14 @@ class TaskProcessingApiController extends \OCP\AppFramework\OCSController { /** @var int|list $outputSlot */ $outputSlot = $task->getOutput()[$key]; if (is_array($outputSlot)) { - $ids += $outputSlot; + $ids = array_merge($outputSlot, $ids); } else { $ids[] = $outputSlot; } } } } - return array_values($ids); + return $ids; } /** -- cgit v1.2.3