From f69dd123ca2a6b6b2764b4c4c8fb1bb3773bf3fa Mon Sep 17 00:00:00 2001
From: Naomi <naomiaro@gmail.com>
Date: Mon, 11 Nov 2013 16:32:43 -0500
Subject: [PATCH] CC-5555 : Implement simple caching for preferences

making sure locale/timezone is returned properly in generic calls.
---
 airtime_mvc/application/models/Preference.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index 882fd9a08..956db1c0d 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -559,12 +559,13 @@ class Application_Model_Preference
         self::setValue("user_timezone", $timezone, true);
     }
 
-    public static function GetUserTimezone($id)
+    public static function GetUserTimezone()
     {
         $timezone = self::getValue("user_timezone", true); 
         if (!$timezone) {
             return self::GetDefaultTimezone();
-        } else {
+        } 
+        else {
             return $timezone;
         }
     }
@@ -598,7 +599,8 @@ class Application_Model_Preference
         $locale = self::getValue("user_locale", true);
         if (!$locale) {
             return self::GetDefaultLocale();
-        } else {
+        } 
+        else {
             return $locale;
         }
     }
@@ -618,7 +620,7 @@ class Application_Model_Preference
         $userId = self::getUserId();
         
         if (!is_null($userId)) {
-            return self::GetUserLocale($userId);
+            return self::GetUserLocale();
         } 
         else {
             return self::GetDefaultLocale();