fixes for r12283: mistakenly passed already-split date to date_unparsed,

and correct a mistaken comment at that header

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12286 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/class/mime/Message.class.php b/class/mime/Message.class.php
index 0ecc70f3bba2492846af1bc84c51f140f7cb1133..8677c92b971d02bb6e257d295f3a428567c8eb95 100644 (file)
--- a/class/mime/Message.class.php
+++ b/class/mime/Message.class.php
@@ -614,10 +614,10 @@ class Message {
 
         if (count($arg_a) > 9) {
             $d = strtr($arg_a[0], array('  ' => ' '));
-            $d = explode(' ', $d);
+            $d_parts = explode(' ', $d);
             if (!$arg_a[1]) $arg_a[1] = _("(no subject)");
 
-            $hdr->date = getTimeStamp($d); /* argument 1: date */
+            $hdr->date = getTimeStamp($d_parts); /* argument 1: date */
             $hdr->date_unparsed = strtr($d,'<>','  '); /* original date */
             $hdr->subject = $arg_a[1];     /* argument 2: subject */
             $hdr->from = is_array($arg_a[2]) ? $arg_a[2][0] : '';     /* argument 3: from        */

diff --git a/class/mime/Rfc822Header.class.php b/class/mime/Rfc822Header.class.php
index f0bd56d9253794b8050aa64b25edd9c7e2d076ff..ccb38c55590129af33eb6ee5d3777d5aa7828e1c 100644 (file)
--- a/class/mime/Rfc822Header.class.php
+++ b/class/mime/Rfc822Header.class.php
@@ -30,7 +30,7 @@ class Rfc822Header {
      */
     var $date = -1;
     /**
-     * Date_original header
+     * Original date header as fallback for unparsable dates
      * @var mixed
      */
     var $date_unparsed = '';