From ab7158559bb10e18e030654f24edacb70f31a57e Mon Sep 17 00:00:00 2001
From: leon <leon@roojs.com>
Date: Tue, 7 Nov 2023 13:31:20 +0800
Subject: [PATCH] sort the timezone

---
 TimeZone.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/TimeZone.php b/TimeZone.php
index 1d8629d9..72a629fb 100644
--- a/TimeZone.php
+++ b/TimeZone.php
@@ -86,8 +86,9 @@ class Pman_Core_TimeZone extends Pman
                 AND
                 Name NOT LIKE 'Etc%'
             ORDER BY
-                timeoffset DESC,
-                Name DESC
+                SUBSTRING_INDEX(Name, '/', 1) ASC,
+                timeoffset ASC,
+                Name ASC
         ");
 
         while($ce->fetch()) {
@@ -149,6 +150,10 @@ class Pman_Core_TimeZone extends Pman
             return '';
         }
 
+        if($dt == '0000-00-00 00:00:00' || $dt == '') {
+            $dt = 'NOW';
+        }
+
         $date = new DateTime($dt, new DateTimeZone($tz));
         return $date->format('P');
     }
-- 
2.39.2