Merge pull request #43225 from bembelimen/upmerges/2024-04-06

[5.1] Upmerges - 2024-04-06

Author: bembelimen

administrator/components/com_content/src/Event/Model/FeatureEvent.php

@@ -71,9 +71,9 @@ public function __construct($name, array $arguments = [])
     }
 
     /**
-     * Set used parameter to true
+     * Set abort and reason parameters.
      *
-     * @param   bool  $value  The value to set
+     * @param   string  $reason  Abort reason
      *
      * @return void
      *

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);