From 34e2344100a6f6e317564640cded08b944800a71 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 25 Sep 2013 17:18:23 -0400 Subject: [PATCH] CC-5323: User's Timezone Can Improperly Edit Show Sometimes show form would populate the start/end time with wrong timezone --- airtime_mvc/application/services/ShowFormService.php | 10 +++++----- airtime_mvc/application/services/ShowService.php | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/airtime_mvc/application/services/ShowFormService.php b/airtime_mvc/application/services/ShowFormService.php index 2cd85ae85..7cd3d586d 100644 --- a/airtime_mvc/application/services/ShowFormService.php +++ b/airtime_mvc/application/services/ShowFormService.php @@ -166,10 +166,10 @@ class Application_Service_ShowFormService //DateTime object in UTC $showStart = $ccShowInstance->getDbStarts(null); - $showStart->setTimezone($timezone); + $showStart->setTimezone(new DateTimeZone($timezone)); $showEnd = $ccShowInstance->getDbEnds(null); - $showEnd->setTimezone($timezone); + $showEnd->setTimezone(new DateTimeZone($timezone)); //if the show has started, do not allow editing on the start time if ($showStart->getTimestamp() <= time()) { @@ -395,10 +395,10 @@ class Application_Service_ShowFormService $starts = new DateTime($ccShowInstance->getDbStarts(), new DateTimeZone("UTC")); $ends = new DateTime($ccShowInstance->getDbEnds(), new DateTimeZone("UTC")); - $userTimezone = Application_Model_Preference::GetTimezone(); + $showTimezone = $this->ccShow->getFirstCcShowDay()->getDbTimezone(); - $starts->setTimezone(new DateTimeZone($userTimezone)); - $ends->setTimezone(new DateTimeZone($userTimezone)); + $starts->setTimezone(new DateTimeZone($showTimezone)); + $ends->setTimezone(new DateTimeZone($showTimezone)); return array($starts, $ends); } diff --git a/airtime_mvc/application/services/ShowService.php b/airtime_mvc/application/services/ShowService.php index 6018cb5b5..c3f4af401 100644 --- a/airtime_mvc/application/services/ShowService.php +++ b/airtime_mvc/application/services/ShowService.php @@ -54,10 +54,10 @@ class Application_Service_ShowService $oldCcShow = CcShowQuery::create() ->findPk($showData["add_show_id"]); - //DateTime in user's local time + //DateTime in shows's local time $newStartDateTime = new DateTime($showData["add_show_start_date"]." ". $showData["add_show_start_time"], - new DateTimeZone(Application_Model_Preference::GetTimezone())); + new DateTimeZone($showData["add_show_timezone"])); $ccShowInstanceOrig = CcShowInstancesQuery::create() ->findPk($showData["add_show_instance_id"]);