Merge pull request #833 from paddatrapper/timezone

Use user-defined timezone if it exists
This commit is contained in:
Robb 2019-06-30 08:03:22 -04:00 committed by GitHub
commit a9a244395d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

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,11 +17,13 @@ class WidgetHelper
// default to the station timezone
$timezone = Application_Model_Preference::GetDefaultTimezone();
$userDefinedTimezone = strtolower($timezone);
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");
$weekStartDateTime->setTimezone($utcTimezone);