From c9773d2a0e4774e1036ef40cee305189254e14b9 Mon Sep 17 00:00:00 2001
From: Naomi <naomiaro@gmail.com>
Date: Wed, 4 Dec 2013 14:13:19 -0500
Subject: [PATCH] CC-5594 : Remove all date_default_timezone_get()

---
 airtime_mvc/application/Bootstrap.php   | 2 --
 airtime_mvc/application/models/Show.php | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index 313e448c8..9d9b3df2e 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -17,10 +17,8 @@ require_once "Timezone.php";
 require_once __DIR__.'/forms/helpers/ValidationTypes.php';
 require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php';
 
-date_default_timezone_set('UTC');
 require_once (APPLICATION_PATH."/logging/Logging.php");
 Logging::setLogPath('/var/log/airtime/zendphp.log');
-date_default_timezone_set(Application_Model_Preference::GetTimezone());
 
 Config::setAirtimeVersion();
 require_once __DIR__."/configs/navigation.php";
diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index e725bc7a0..d4ff8a972 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -1091,8 +1091,8 @@ SQL;
         $content_count = Application_Model_ShowInstance::getContentCount(
             $p_start, $p_end);
         $isFull = Application_Model_ShowInstance::getIsFull($p_start, $p_end);
-        $timezone = date_default_timezone_get();
-        $current_timezone = new DateTimeZone($timezone);
+        $userTimezone = Application_Model_Preference::GetUserTimezone();
+        $displayTimezone = new DateTimeZone($userTimezone);
         $utc = new DateTimeZone("UTC");
         $now = new DateTime("now", $utc);
 
@@ -1124,8 +1124,8 @@ SQL;
                 }
             }
 
-            $startsDT->setTimezone($current_timezone);
-            $endsDT->setTimezone($current_timezone);
+            $startsDT->setTimezone($displayTimezone);
+            $endsDT->setTimezone($displayTimezone);
 
             $options["show_empty"] = (array_key_exists($show['instance_id'],
                 $content_count)) ? 0 : 1;