upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-23 15:21:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 42

Merge pull request #49087 from AIlkiv/getting-default-timezone-for-local-time

Browse source
This commit is contained in:
John Molakvoæ 2024-11-09 14:23:45 +01:00 committed by GitHub
commit 8ff3f21f1d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/Contacts/ContactsMenu/Providers/LocalTimeProvider.php
View file

@ -35,7 +35,7 @@ class LocalTimeProvider implements IProvider {
$targetUserId = $entry->getProperty('UID');
$targetUser = $this->userManager->get($targetUserId);
if (!empty($targetUser)) {
$timezone = $this->config->getUserValue($targetUser->getUID(), 'core', 'timezone') ?: date_default_timezone_get();
$timezone = $this->config->getUserValue($targetUser->getUID(), 'core', 'timezone') ?: $this->config->getSystemValueString('default_timezone', 'UTC');
$dateTimeZone = new \DateTimeZone($timezone);
$localTime = $this->dateTimeFormatter->formatTime($this->timeFactory->getDateTime(), 'short', $dateTimeZone);