[SM-CVS] SF.net SVN: squirrelmail: [12297] branches/SM-1_4-STABLE/squirrelmail

[<ki...@us...>]

Revision: 12297
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12297&view=rev
Author:   kink
Date:     2007-03-03 11:21:51 -0800 (Sat, 03 Mar 2007)

Log Message:
-----------
Fix "Unknown Sender" on message after reading a digest (#1673047).
This is actually a workaround (r10703 from devel), but it works,
and this is stable so we are not going to refactor the backend
anyway. Thanks Tomas Kuliavas.

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/functions/mime.php

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2007-03-03 19:10:09 UTC (rev 12296)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2007-03-03 19:21:51 UTC (rev 12297)
@@ -24,6 +24,7 @@
     by itself, resolving a problem in the listcommands plugin (#1663762).
   - If a date-header cannot be parsed, display the unparsed version as a
     better-than-nothing alternative.
+  - Fix "Unknown Sender" on message after reading a digest (#1673047).
 
 Version 1.4.9a - 3 December 2006
 --------------------------------

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/mime.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/mime.php	2007-03-03 19:10:09 UTC (rev 12296)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/mime.php	2007-03-03 19:21:51 UTC (rev 12297)
@@ -426,6 +426,10 @@
             $from_o = $rfc822_header->from;
             if (is_object($from_o)) {
                 $from_name = $from_o->getAddress(false);
+            } elseif (is_array($from_o) && count($from_o) && is_object($from_o[0])) {
+                // when a digest message is opened and you return to the digest
+                // now the from object is part of an array. This is a workaround.
+                $from_name = decodeHeader($from_o[0]->getAddress(false));
             } else {
                 $from_name = _("Unknown sender");
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.