diff options
| author | Marcel Klehr <mklehr@gmx.net> | 2024-07-01 15:01:29 +0200 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2024-11-06 09:44:11 +0000 |
| commit | 7a309e7a9929fd95970be5a3a3092a379e38cc69 (patch) | |
| tree | 80a16e0b09e8693380722e994e92823b5ab6ea30 | |
| parent | 14013a5f18a9e005ee21cde913a7d18ef80aabdb (diff) | |
| download | nextcloud-server-7a309e7a9929fd95970be5a3a3092a379e38cc69.tar.gz nextcloud-server-7a309e7a9929fd95970be5a3a3092a379e38cc69.zip | |
fix(TaskProcessingApiController): Don't use + to merge non-assoc. arraysbackport/46222/stable30
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
| -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 e0c8eb90464..da1f339beac 100644 --- a/core/Controller/TaskProcessingApiController.php +++ b/core/Controller/TaskProcessingApiController.php @@ -380,7 +380,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; } @@ -392,14 +392,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; } /** |