upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 14:50:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 53

Merge pull request #46222 from nextcloud/fix/task-processing-api-controller/dont-use-plus

Browse source
This commit is contained in:
John Molakvoæ 2024-11-06 09:02:23 +01:00 committed by GitHub
commit 452e4be4f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/Controller/TaskProcessingApiController.php
View file

@ -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;
}
/**