Fix time display

adaur · adaur · commit 1e4f4cc377ad · 2019-05-05T14:17:07.000-04:00
diff --git a/featherbb/Core/Utils.php b/featherbb/Core/Utils.php
@@ -91,12 +91,14 @@ public static function formatTime($timestamp, $dateOnly = false, $dateFormat = n
 
         if (is_null($dateFormat)) {
             $availableDateFormats = Container::get('forum_date_formats');
-            $dateFormat = $availableDateFormats[User::getPref('date_format')];
+            $userFormat = User::getPref('date_format');
+            $dateFormat = isset($availableDateFormats[$userFormat]) ? $availableDateFormats[$userFormat] : $userFormat;
         }
 
         if (is_null($timeFormat)) {
             $availableTimeFormats = Container::get('forum_time_formats');
-            $timeFormat = $availableTimeFormats[User::getPref('time_format')];
+            $userFormat = User::getPref('time_format');
+            $timeFormat = isset($availableTimeFormats[$userFormat]) ? $availableTimeFormats[$userFormat] : $userFormat;
         }
 
         $date = gmdate($dateFormat, $timestamp);

Original file line number	Diff line number	Diff line change
`@@ -91,12 +91,14 @@ public static function formatTime($timestamp, $dateOnly = false, $dateFormat = n`
`91`	`91`
`92`	`92`	`if (is_null($dateFormat)) {`
`93`	`93`	`$availableDateFormats = Container::get('forum_date_formats');`
`94`		`- $dateFormat = $availableDateFormats[User::getPref('date_format')];`
	`94`	`+ $userFormat = User::getPref('date_format');`
	`95`	`+ $dateFormat = isset($availableDateFormats[$userFormat]) ? $availableDateFormats[$userFormat] : $userFormat;`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`if (is_null($timeFormat)) {`
`98`	`99`	`$availableTimeFormats = Container::get('forum_time_formats');`
`99`		`- $timeFormat = $availableTimeFormats[User::getPref('time_format')];`
	`100`	`+ $userFormat = User::getPref('time_format');`
	`101`	`+ $timeFormat = isset($availableTimeFormats[$userFormat]) ? $availableTimeFormats[$userFormat] : $userFormat;`
`100`	`102`	`}`
`101`	`103`
`102`	`104`	`$date = gmdate($dateFormat, $timestamp);`