From 7fdc5f9e485f224ebc50353a1817b66a6db6587f Mon Sep 17 00:00:00 2001 From: leon Date: Fri, 27 Oct 2023 15:17:57 +0800 Subject: [PATCH] TimeZone.php --- TimeZone.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/TimeZone.php b/TimeZone.php index ff141ca9..a7c59274 100644 --- a/TimeZone.php +++ b/TimeZone.php @@ -123,30 +123,42 @@ class Pman_Core_TimeZone extends Pman static function toRegion($tz) { if(!self::isValidTimeZone($tz)) { - return false; + return ''; } return explode('/', $tz)[0]; } static function toArea($tz) { + if(!self::isValidTimeZone($tz)) { + return ''; + } return explode('/', $tz)[1]; } static function toTimeOffset($dt, $tz) { + if(!self::isValidTimeZone($tz)) { + return ''; + } $date = new DateTime($dt, new DateTimeZone($tz)); return $date->format('P'); } static function toDisplayArea($dt, $tz) { + if(!self::isValidTimeZone($tz)) { + return ''; + } return str_replace('_', ' ', self::toArea($tz)) . ' (GMT ' . self::toTimeOffset($dt,$tz) . ')'; } static function toDisplayName($dt, $tz) { + if(!self::isValidTimeZone($tz)) { + return ''; + } return self::toRegion($tz) . '/' . self::toDisplayArea($dt, $tz); } } \ No newline at end of file -- 2.39.2