diff --git a/inc/email.php b/inc/email.php index 95f52a4..6d66fb0 100644 --- a/inc/email.php +++ b/inc/email.php @@ -95,6 +95,6 @@ class Email extends PhpObject { } private static function getTimeZoneCity($sTimeZone) { - return (strpos($sTimeZone, '/')!==false)?str_replace('_', ' ', explode('/', $sTimeZone)[1]):''; + return (strpos($sTimeZone, '/')!==false)?str_replace('_', ' ', explode('/', $sTimeZone)[1]):$sTimeZone; } } \ No newline at end of file diff --git a/script/spot.js b/script/spot.js index 5313b94..8c1d118 100755 --- a/script/spot.js +++ b/script/spot.js @@ -252,8 +252,11 @@ function setElem(aoAnchor, asPath, oValue) } function getTimeZoneDesc(sTimeZoneName) { - var sCity = sTimeZoneName.split('/')[1].replace('_', ' ') || ''; - return oSpot.lang('city_time', sCity); + if(sTimeZoneName.indexOf('/')==-1) return sTimeZoneName; + else { + var sCity = sTimeZoneName.split('/')[1].replace('_', ' ') || ''; + return oSpot.lang('city_time', sCity); + } } $.prototype.addInput = function(sType, sName, sValue, aoEvents)