From 345c782eb917cc276194625b5d6b1fa7a3d62cf4 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Mon, 9 Jun 2014 11:34:25 -0400 Subject: [PATCH] Fixed the unit tests and changed ops->zu --- airtime_mvc/application/models/Preference.php | 6 +++++- airtime_mvc/application/views/scripts/dashboard/about.phtml | 2 +- airtime_mvc/application/views/scripts/login/index.phtml | 2 +- airtime_mvc/tests/application/helpers/TestHelper.php | 1 - 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index c873ea88f..e73069f43 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -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) diff --git a/airtime_mvc/application/views/scripts/dashboard/about.phtml b/airtime_mvc/application/views/scripts/dashboard/about.phtml index 05f65cd80..f2ccfa02d 100644 --- a/airtime_mvc/application/views/scripts/dashboard/about.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/about.phtml @@ -10,7 +10,7 @@ echo sprintf(_("%sAirtime%s %s, the open radio software for scheduling and remot ?>
© 2013 ", "", "", diff --git a/airtime_mvc/application/views/scripts/login/index.phtml b/airtime_mvc/application/views/scripts/login/index.phtml index 3012ae985..178aca493 100644 --- a/airtime_mvc/application/views/scripts/login/index.phtml +++ b/airtime_mvc/application/views/scripts/login/index.phtml @@ -4,7 +4,7 @@