diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2024-11-06 09:02:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-06 09:02:23 +0100 |
| commit | 452e4be4f5e27d76f3cb52b9016c0dbbd989841a (patch) | |
| tree | c155edee5ee19ffb4739a88a78a6e4318e2fa857 /core/Controller/TaskProcessingApiController.php | |
| parent | d53fde8eef13d408fcf035ea8a95e6345df9b99b (diff) | |
| parent | 224779c33f7ff27648a6d130918c0e7f662e1ed8 (diff) | |
| download | nextcloud-server-452e4be4f5e27d76f3cb52b9016c0dbbd989841a.tar.gz nextcloud-server-452e4be4f5e27d76f3cb52b9016c0dbbd989841a.zip | |
Merge pull request #46222 from nextcloud/fix/task-processing-api-controller/dont-use-plus
Diffstat (limited to 'core/Controller/TaskProcessingApiController.php')
| -rw-r--r-- | core/Controller/TaskProcessingApiController.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/Controller/TaskProcessingApiController.php b/core/Controller/TaskProcessingApiController.php index e41c178f44d..c8d3c60df36 100644 --- a/core/Controller/TaskProcessingApiController.php +++ b/core/Controller/TaskProcessingApiController.php @@ -378,7 +378,7 @@ class TaskProcessingApiController extends \OCP\AppFramework\OCSController { /** @var int|list<int> $inputSlot */ $inputSlot = $task->getInput()[$key]; if (is_array($inputSlot)) { - $ids += $inputSlot; + $ids = array_merge($inputSlot, $ids); } else { $ids[] = $inputSlot; } @@ -390,14 +390,14 @@ class TaskProcessingApiController extends \OCP\AppFramework\OCSController { /** @var int|list<int> $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; } /** |