Mfa: Setting timezone for dates in profile (#43191)

joomla · Apr 5, 2024 · b8d58e7 · b8d58e7
1 parent aa7a1c7
commit b8d58e7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/administrator/components/com_users/src/Model/MethodsModel.php b/administrator/components/com_users/src/Model/MethodsModel.php
@@ -127,6 +127,7 @@ public function formatRelative(?string $dateTimeText): string
         $utcTimeZone = new \DateTimeZone('UTC');
         $jDate       = new Date($dateTimeText, $utcTimeZone);
         $unixStamp   = $jDate->toUnix();
+        $app         = Factory::getApplication();
 
         // I'm pretty sure we didn't have MFA in Joomla back in 1970 ;)
         if ($unixStamp < 0) {
@@ -135,7 +136,7 @@ public function formatRelative(?string $dateTimeText): string
 
         // I need to display the date in the user's local timezone. That's how you do it.
         $user   = $this->getCurrentUser();
-        $userTZ = $user->getParam('timezone', 'UTC');
+        $userTZ = $user->getParam('timezone', $app->get('offset', 'UTC'));
         $tz     = new \DateTimeZone($userTZ);
         $jDate->setTimezone($tz);