[mms] Better handling of malformed message dates in mailbox listing (…

…Bug #13114). Conflicts: imp/docs/CHANGES imp/package.xml
horde · Apr 14, 2014 · 36bab91 · 36bab91
1 parent 6d0f143
commit 36bab91
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -76,6 +76,8 @@ v6.1.8
       view (João Machado <geral@jpaulo.eu>).
 [mms] SECURITY: Fix XSS in displaying mailbox name in dynamic mailbox view
       (João Machado <geral@jpaulo.eu>).
+[mms] Better handling of malformed message dates in mailbox listing (Bug
+      #13114).
 [jan] Update Korean translation (Deokgon Kim <dgkim@dgkim.net>).
 
 

diff --git a/imp/lib/Mailbox/Ui.php b/imp/lib/Mailbox/Ui.php
@@ -129,6 +129,10 @@ public function getFrom($ob)
     public function getDate($date, $format = 0)
     {
         if (!is_object($date)) {
+            if (is_null($date)) {
+                return _("Unknown Date");
+            }
+
             $date = new Horde_Imap_Client_DateTime($date);
         }
 

diff --git a/imp/package.xml b/imp/package.xml
@@ -3564,6 +3564,7 @@
 * [mms] SECURITY: Fix XSS in displaying user-defined flags in basic mailbox and message view.
 * [mms] SECURITY: Fix XSS in displaying user-defined flags in dynamic mailbox view (João Machado &lt;geral@jpaulo.eu&gt;).
 * [mms] SECURITY: Fix XSS in displaying mailbox name in dynamic mailbox view (João Machado &lt;geral@jpaulo.eu&gt;).
+* [mms] Better handling of malformed message dates in mailbox listing (Bug #13114).
 * [jan] Update Korean translation (Deokgon Kim &lt;dgkim@dgkim.net&gt;).
    </notes>
   </release>