From 4254a45e74d360f4fbab26f57c15926b7430fffa Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Sun, 12 Feb 2012 00:50:51 -0500
Subject: [PATCH] CC-3322: PHP warning during 2.0.1 upgrade process

---
 install_minimal/upgrades/airtime-2.0.1/UpgradeCommon.php  | 8 ++++++++
 .../upgrades/airtime-2.0.1/airtime-upgrade.php            | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/install_minimal/upgrades/airtime-2.0.1/UpgradeCommon.php b/install_minimal/upgrades/airtime-2.0.1/UpgradeCommon.php
index f2e039326..38bbb31f6 100644
--- a/install_minimal/upgrades/airtime-2.0.1/UpgradeCommon.php
+++ b/install_minimal/upgrades/airtime-2.0.1/UpgradeCommon.php
@@ -18,6 +18,14 @@ class UpgradeCommon{
     const CONF_BACKUP_SUFFIX = "201";
     const VERSION_NUMBER = "2.0.1";
     
+    public static function SetDefaultTimezone()
+    {       
+        $sql = "SELECT valstr from cc_pref WHERE keystr = 'timezone'";
+
+        $timezone = self::queryDb($sql);
+        date_default_timezone_set($timezone);
+    }
+    
     public static function connectToDatabase($p_exitOnError = true)
     {
         global $CC_DBC, $CC_CONFIG;
diff --git a/install_minimal/upgrades/airtime-2.0.1/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.0.1/airtime-upgrade.php
index dc023c415..fcb2b0968 100644
--- a/install_minimal/upgrades/airtime-2.0.1/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-2.0.1/airtime-upgrade.php
@@ -80,4 +80,6 @@ class AirtimeConfigFileUpgrade{
 
 }
 
+UpgradeCommon::connectToDatabase();
+UpgradeCommon::SetDefaultTimezone();
 AirtimeConfigFileUpgrade::start();