TimeZone.php

[Pman.Core] / TimeZone.php

diff --git a/TimeZone.php b/TimeZone.php
index 6bb9089..9db0d0c 100644 (file)
--- a/TimeZone.php
+++ b/TimeZone.php
@@ -115,16 +115,16 @@ class Pman_Core_TimeZone extends Pman
         return $date->format('P');
     }
 
-    static function toDisplayName($dt, $tz)
+    static function toDisplayArea($dt, $tz)
     {
         $ar = explode('/', $tz);
-        return $ar[0] . '/' . str_replace('_', ' ', $ar[1]) . ' (GMT ' . self::toTimeOffset($dt,$tz) . ')'; 
+        return str_replace('_', ' ', $ar[1]) . ' (GMT ' . self::toTimeOffset($dt,$tz) . ')';
+
     }
 
-    static function toDisplayArea($tz)
+    static function toDisplayName($dt, $tz)
     {
         $ar = explode('/', $tz);
-        return str_replace('_', ' ', $ar[1]);
-
+        return $ar[0] . '/' . self::toDisplayArea($dt, $tz);
     }
 }
\ No newline at end of file