kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-11 15:16:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into fix/currency-account-end-date

Browse Source
This commit is contained in:
mergify[bot]
2025-10-07 08:04:45 +00:00
committed by GitHub
parent 11e721c6c9 4bc77b2707
commit f948cc95b4
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php
View File

@@ -121,8 +121,8 @@ class SubscriptionEnrichment implements EnrichmentInterface
// add object group if available // add object group if available
if (array_key_exists($id, $this->mappedObjects)) { if (array_key_exists($id, $this->mappedObjects)) {
$key = $this->mappedObjects[$id]; $key = $this->mappedObjects[$id];
if(array_key_exists($key, $this->objectGroups)) { if (array_key_exists($key, $this->objectGroups)) {
$meta['object_group_id'] = (string)$this->objectGroups[$key]['id']; $meta['object_group_id'] = (string)$this->objectGroups[$key]['id'];
$meta['object_group_title'] = $this->objectGroups[$key]['title']; $meta['object_group_title'] = $this->objectGroups[$key]['title'];
$meta['object_group_order'] = $this->objectGroups[$key]['order']; $meta['object_group_order'] = $this->objectGroups[$key]['order'];

4
changelog.md
View File

@@ -10,8 +10,8 @@ Everything from v6.4.1, plus:
### Fixed ### Fixed
- #11015 - [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
- #11016 - [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 ## 6.4.1 - 2025-10-07

4
config/firefly.php
View File

@@ -78,8 +78,8 @@ return [
'running_balance_column' => env('USE_RUNNING_BALANCE', false), 'running_balance_column' => env('USE_RUNNING_BALANCE', false),
// see cer.php for exchange rates feature flag. // see cer.php for exchange rates feature flag.
], ],
'version' => '6.4.1', 'version' => 'develop/2025-10-07',
'build_time' => 1759814318, 'build_time' => 1759823774,
'api_version' => '2.1.0', // field is no longer used. 'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used. 'db_version' => 28, // field is no longer used.