From 66393099352397159ea8fe99a95621f063de0778 Mon Sep 17 00:00:00 2001 From: JC5 Date: Tue, 7 Oct 2025 09:58:06 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Auto=20commit=20for=20release=20?= =?UTF-8?q?'develop'=20on=202025-10-07?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php | 4 ++-- changelog.md | 4 ++-- config/firefly.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php index 196885b0e0..3068c45d88 100644 --- a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php +++ b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php @@ -121,8 +121,8 @@ class SubscriptionEnrichment implements EnrichmentInterface // add object group if available if (array_key_exists($id, $this->mappedObjects)) { - $key = $this->mappedObjects[$id]; - if(array_key_exists($key, $this->objectGroups)) { + $key = $this->mappedObjects[$id]; + if (array_key_exists($key, $this->objectGroups)) { $meta['object_group_id'] = (string)$this->objectGroups[$key]['id']; $meta['object_group_title'] = $this->objectGroups[$key]['title']; $meta['object_group_order'] = $this->objectGroups[$key]['order']; diff --git a/changelog.md b/changelog.md index 16e6703e7e..d7cc07996a 100644 --- a/changelog.md +++ b/changelog.md @@ -10,8 +10,8 @@ Everything from v6.4.1, plus: ### Fixed -- #11015 -- #11016 +- [Issue 11015](https://github.com/firefly-iii/firefly-iii/issues/11015) (Call to a member function subSecond() on null when viewing accounts) reported by @sirgio145 +- [Issue 11016](https://github.com/firefly-iii/firefly-iii/issues/11016) (Undefined array key 1 when viewing subscriptions) reported by @anuneo ## 6.4.1 - 2025-10-07 diff --git a/config/firefly.php b/config/firefly.php index 35f9953702..23b376a208 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -78,8 +78,8 @@ return [ 'running_balance_column' => env('USE_RUNNING_BALANCE', false), // see cer.php for exchange rates feature flag. ], - 'version' => '6.4.1', - 'build_time' => 1759814318, + 'version' => 'develop/2025-10-07', + 'build_time' => 1759823774, 'api_version' => '2.1.0', // field is no longer used. 'db_version' => 28, // field is no longer used.