From 9cb4633823267cdd48053bf947d0c0a37712cc2c Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Wed, 16 Jan 2013 12:42:58 -0500
Subject: [PATCH] CC-4850: Upgrade Scripts -> Add default timezone and locale
 for each user in cc_pref

-fallback to default settings if user setting is not set
---
 airtime_mvc/application/models/Preference.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index f8b06c9a5..30c6e80d9 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -457,7 +457,12 @@ class Application_Model_Preference
 
     public static function GetUserTimezone($id)
     {
-        return self::getValue("user_timezone", true);
+        $timezone = self::getValue("user_timezone", true); 
+        if (!$timezone) {
+            return self::GetDefaultTimezone();
+        } else {
+            return $timezone;
+        }
     }
 
     public static function GetTimezone()
@@ -484,7 +489,12 @@ class Application_Model_Preference
 
     public static function GetUserLocale($id)
     {
-        return self::getValue("user_locale", true);
+        $locale = self::getValue("user_locale", true);
+        if (!$locale) {
+            return self::GetDefaultLocale();
+        } else {
+            return $locale;
+        }
     }
 
     public static function SetUserLocale($userId, $locale = null)