Use user-defined timezone if it exists

Fixes: #785
This commit is contained in:
Kyle Robbertze 2019-06-29 22:27:55 +02:00
parent 277c037779
commit c69136767e

View file

@ -4,7 +4,7 @@ define("DAYS_PER_WEEK", 7);
class WidgetHelper
{
public static function getWeekInfo($timezone)
public static function getWeekInfo($userDefinedTimezone)
{
//weekStart is in station time.
$weekStartDateTime = Application_Common_DateHelper::getWeekStartDateTime();
@ -17,10 +17,12 @@ class WidgetHelper
// default to the station timezone
$timezone = Application_Model_Preference::GetDefaultTimezone();
$userDefinedTimezone = strtolower($timezone);
// if the timezone defined by the user exists, use that
if (array_key_exists($userDefinedTimezone, timezone_abbreviations_list())) {
$timezone = $userDefinedTimezone;
if ($userDefinedTimezone) {
$userDefinedTimezone = strtolower($userDefinedTimezone);
// if the timezone defined by the user exists, use that
if (array_key_exists($userDefinedTimezone, timezone_abbreviations_list())) {
$timezone = $userDefinedTimezone;
}
}
$utcTimezone = new DateTimeZone("UTC");
@ -170,4 +172,4 @@ class WidgetHelper
}
}
}
}
}