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

Fix date issues.

Browse Source
This commit is contained in:
James Cole
2020-06-21 19:08:57 +02:00
parent 1c74db30ed dfe099f9c6
commit 7196ac3ec9
4 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -553,9 +553,14 @@ class GroupCollector implements GroupCollectorInterface
$result['tags'] = [];
$result['attachments'] = [];
try {
$result['date'] = new Carbon($result['date']);
$result['created_at'] = new Carbon($result['created_at']);
$result['updated_at'] = new Carbon($result['updated_at']);
$result['date'] = new Carbon($result['date'], 'UTC');
$result['created_at'] = new Carbon($result['created_at'], 'UTC');
$result['updated_at'] = new Carbon($result['updated_at'], 'UTC');
// this is going to happen a lot:
$result['date']->setTimezone(env('TZ'));
$result['created_at']->setTimezone(env('TZ'));
$result['updated_at']->setTimezone(env('TZ'));
} catch (Exception $e) {
Log::error($e->getMessage());
}