From 04b592b831cc85484b73b6bbc3ac567cbed749b9 Mon Sep 17 00:00:00 2001 From: James Date: Thu, 12 Jan 2012 16:36:14 -0500 Subject: [PATCH] CC-3245: upgrade 1.8->2.0 cause error in show recorder - fixed --- airtime_mvc/application/controllers/ApiController.php | 1 + python_apps/show-recorder/recorder.py | 1 + 2 files changed, 2 insertions(+) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 332a42ce0..53bb0008d 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -377,6 +377,7 @@ class ApiController extends Zend_Controller_Action $this->view->is_recording = false; + $this->view->server_timezone = Application_Model_Preference::GetTimezone(); $rows = Application_Model_Show::GetCurrentShow($today_timestamp); Application_Model_Show::ConvertToLocalTimeZone($rows, array("starts", "ends", "start_timestamp", "end_timestamp")); diff --git a/python_apps/show-recorder/recorder.py b/python_apps/show-recorder/recorder.py index da94e212c..ddfef802d 100644 --- a/python_apps/show-recorder/recorder.py +++ b/python_apps/show-recorder/recorder.py @@ -297,6 +297,7 @@ class CommandListener(): temp = self.api_client.get_shows_to_record() if temp is not None: shows = temp['shows'] + self.server_timezone = temp['server_timezone'] self.parse_shows(shows) self.logger.info("Bootstrap complete: got initial copy of the schedule") except Exception, e: