From dd66a1adf0bdd41e1f2889c66fc5b6f1a1df6019 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 23 Feb 2022 10:52:24 +0100 Subject: [PATCH] Fix https://github.com/firefly-iii/firefly-iii/issues/5810 --- app/Helpers/Collector/Extensions/MetaCollection.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Helpers/Collector/Extensions/MetaCollection.php b/app/Helpers/Collector/Extensions/MetaCollection.php index e5f4344932..ff967fd6e6 100644 --- a/app/Helpers/Collector/Extensions/MetaCollection.php +++ b/app/Helpers/Collector/Extensions/MetaCollection.php @@ -222,8 +222,8 @@ trait MetaCollection $this->hasJoinedMetaTables = true; $this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id'); } - $this->query->where(function(Builder $q1) { - $q1->where(function(Builder $q2) { + $this->query->where(function (Builder $q1) { + $q1->where(function (Builder $q2) { $q2->where('journal_meta.name', '=', 'external_url'); $q2->whereNull('journal_meta.data'); })->orWhereNull('journal_meta.name'); @@ -488,7 +488,10 @@ trait MetaCollection public function withoutNotes(): GroupCollectorInterface { $this->withNotes(); - $this->query->whereNull('notes.text'); + $this->query->where(function (Builder $q) { + $q->whereNull('notes.text'); + $q->orWhere('notes.text', ''); + }); return $this; }