Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev

Browse source
This commit is contained in:
Albert Santoni 2015-09-02 10:42:23 -04:00
commit 6251fd62d5
17 changed files with 199 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

10
airtime_mvc/application/models/Preference.php
View file

@ -480,10 +480,6 @@ class Application_Model_Preference
public static function SetUserTimezone($timezone = null)
{
// When a new user is created they will get the default timezone
// setting which the admin sets on preferences page
if (is_null($timezone))
$timezone = self::GetDefaultTimezone();
self::setValue("user_timezone", $timezone, true);
}
@ -523,10 +519,10 @@ class Application_Model_Preference
public static function GetUserLocale()
{
$locale = self::getValue("user_locale", true);
if (!$locale) {
// empty() checks for null and empty strings - more robust than !val
if (empty($locale)) {
return self::GetDefaultLocale();
}
else {
} else {
return $locale;
}
}