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

Merge branch '2.5.x' into cc-5709-airtime-analyzer

Browse source 
Conflicts:
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
This commit is contained in:
Albert Santoni 2014-06-09 11:36:51 -04:00
commit 560d1a9b14
8 changed files with 28 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -545,7 +545,11 @@ class Application_Model_Preference
// Returns station default timezone (from preferences)
public static function GetDefaultTimezone()
{
return self::getValue("timezone");
$stationTimezone = self::getValue("timezone");
if (is_null($stationTimezone) || $stationTimezone == "") {
$stationTimezone = "UTC";
}
return $stationTimezone;
}
public static function SetUserTimezone($timezone = null)
@ -1313,7 +1317,12 @@ class Application_Model_Preference
}
$ds = unserialize($v);
if (is_null($ds) || !is_array($ds)) {
return $id;
}
if (!array_key_exists('ColReorder', $ds)) {
return $id;
}