fix for displaying attachment names

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

diff --git a/functions/mime.php b/functions/mime.php
index e7370aa7bc43bf42e5e6059403fab0a2b3713fc8..8717a5b639d4015abf09ff98a8306756f56271ba 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -408,7 +408,7 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) {
                         "<TD><SMALL>[ $type0/$type1 ]&nbsp;</SMALL></TD>" .
                         '<TD><SMALL>';
            $from_o = $header->from;
-           if (isset($from_o)) {
+           if (is_object($from_o)) {
                $from_name = $from_o->getAddress(false);
            } else {
                $from_name = _("Unknown sender");
@@ -430,6 +430,7 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) {
         } else {
             $filename = decodeHeader($header->filename);
             if (trim($filename) == '') {
+               $name = decodeHeader($header->name);
                 if (trim($name) == '') {
                     if ( trim( $header->id ) == '' )
                         $display_filename = 'untitled-[' . $ent . ']' ;