Request #5717 - Workaround obsolete UT dates.

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index 03e7b3f..a54c5ba 100644 (file)
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -39,6 +39,7 @@ v5.0-cvs
 v4.3.3-cvs
 ----------
 
+[mms] Workaround obsolete 'UT' date format (Request #5717).
 [mms] Fix tracking folder changes when renaming (Bug #7772).
 [cjh] Suppress browser autocomplete when redirecting messages (Bug #7767).
 

diff --git a/imp/lib/UI/Mailbox.php b/imp/lib/UI/Mailbox.php
index 7df4052..91e3912 100644 (file)
--- a/imp/lib/UI/Mailbox.php
+++ b/imp/lib/UI/Mailbox.php
@@ -220,7 +220,15 @@ class IMP_UI_Mailbox
         try {
             $d = new DateTime($date);
         } catch (Exception $e) {
-            return _("Unknown Date");
+            /* Bug #5717 - Check for UT vs. UTC. */
+            if (substr(rtrim($date), -3) != ' UT') {
+                return _("Unknown Date");
+            }
+            try {
+                $d = new DateTime($date . 'C');
+            } catch (Exception $e) {
+                return _("Unknown Date");
+            }
         }
         $udate = $d->format('U');