sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(TaskProcessingApiController): Don't use + to merge non-assoc. arrays 

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
pull/46222/head
Marcel Klehr 2024-07-01 15:01:29 +07:00
parent 7bd215896e
commit 224779c33f
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
Unescape Escape View File

@ -285,7 +285,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;
}
@ -297,14 +297,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;
}
/**