Friendica/friendica-github
1
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2025-02-07 00:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Inject config into App::loadDefaultTimezone() via parameter

Browse source
This commit is contained in:
Art4 2025-01-22 12:36:14 +00:00
parent fdb14f23f2
commit 6c0a2eaefc
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/App.php
View file

@ -308,7 +308,7 @@ class App
$viewDefinition->load(true);
}
$this->loadDefaultTimezone();
$this->loadDefaultTimezone($config);
}
/**
@ -318,10 +318,10 @@ class App
*
* @global string $default_timezone
*/
private function loadDefaultTimezone()
private function loadDefaultTimezone(IManageConfigValues $config)
{
if ($this->config->get('system', 'default_timezone')) {
$timezone = $this->config->get('system', 'default_timezone', 'UTC');
if ($config->get('system', 'default_timezone')) {
$timezone = $config->get('system', 'default_timezone', 'UTC');
} else {
global $default_timezone;
$timezone = $default_timezone ?? '' ?: 'UTC';