IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-20 11:48:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/9491

Browse Source
This commit is contained in:
James Cole 2024-11-23 20:59:08 +01:00
parent cd10d04907
commit 1ac7275f83
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Factory/TransactionJournalFactory.php
View File

@ -173,7 +173,8 @@ class TransactionJournalFactory
$carbon->setTimezone(config('app.timezone'));
// 2024-11-19, overrule timezone with UTC and store it as UTC.
if (FireflyConfig::get('utc', false)) {
if (FireflyConfig::get('utc', false)->data) {
$carbon->setTimezone('UTC');
}
// $carbon->setTimezone('UTC');

4
app/Http/Middleware/Installer.php
View File

@ -158,6 +158,10 @@ class Installer
// version compare thing.
$configVersion = (string)config('firefly.version');
$dbVersion = (string)app('fireflyconfig')->getFresh('ff3_version', '1.0')->data;
if(str_starts_with($configVersion, 'develop')) {
Log::debug('Skipping version check for develop version.');
return false;
}
if (1 === version_compare($configVersion, $dbVersion)) {
app('log')->warning(
sprintf(

2
app/Services/Internal/Update/JournalUpdateService.php
View File

@ -489,7 +489,7 @@ class JournalUpdateService
$value->setTimezone(config('app.timezone'));
// 2024-11-22, overrule timezone with UTC and store it as UTC.
if (FireflyConfig::get('utc', false)) {
if (FireflyConfig::get('utc', false)->data) {
$value->setTimezone('UTC');
}