kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 11:48:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix #4628

Browse Source
This commit is contained in:
James Cole
2021-04-09 16:02:50 +02:00
parent 56b2fa69bc
commit 95d72d065b
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Helpers/Collector/GroupCollector.php
View File

@@ -338,7 +338,7 @@ class GroupCollector implements GroupCollectorInterface
*/ */
public function setJournalIds(array $journalIds): GroupCollectorInterface public function setJournalIds(array $journalIds): GroupCollectorInterface
{ {
if (0!==count($journalIds)) { if (0 !== count($journalIds)) {
$this->query->whereIn('transaction_journals.id', $journalIds); $this->query->whereIn('transaction_journals.id', $journalIds);
} }
@@ -718,10 +718,12 @@ class GroupCollector implements GroupCollectorInterface
// also merge attachments: // also merge attachments:
if (array_key_exists('attachment_id', $result)) { if (array_key_exists('attachment_id', $result)) {
$attachmentId = (int)$augumentedJournal['attachment_id']; $attachmentId = (int)$augumentedJournal['attachment_id'];
$result['attachments'][$attachmentId] = [ if (0 !== $attachmentId) {
'id' => $attachmentId, $result['attachments'][$attachmentId] = [
]; 'id' => $attachmentId,
];
}
} }
return $result; return $result;