From 97cc4050a4e565dfc3facab7b4bc2c4a58328920 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Mon, 19 Oct 2015 12:37:34 -0400 Subject: [PATCH] CC-6139: User timezone setting displays incorrectly in user settings --- airtime_mvc/application/forms/EditUser.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/forms/EditUser.php b/airtime_mvc/application/forms/EditUser.php index cbb2ec22f..f49ea0340 100644 --- a/airtime_mvc/application/forms/EditUser.php +++ b/airtime_mvc/application/forms/EditUser.php @@ -118,12 +118,12 @@ class Application_Form_EditUser extends Zend_Form $locale = new Zend_Form_Element_Select("cu_locale"); $locale->setLabel(_("Language:")); $locale->setMultiOptions(Application_Model_Locale::getLocales()); - $locale->setValue(Application_Model_Preference::GetUserLocale($currentUserId)); + $locale->setValue(Application_Model_Preference::GetUserLocale()); $locale->setDecorators(array('ViewHelper')); $this->addElement($locale); - $stationTz = Application_Model_Preference::GetTimezone($currentUserId); - $userTz = Application_Model_Preference::GetUserTimezone($currentUserId); + $stationTz = Application_Model_Preference::GetDefaultTimezone(); + $userTz = Application_Model_Preference::GetUserTimezone(); $timezone = new Zend_Form_Element_Select("cu_timezone"); $timezone->setLabel(_("Interface Timezone:"));