[Svn] r6100 - trunk/roundcubemail/program/steps/mail

trac at roundcube.net trac at roundcube.net
Thu Apr 19 08:38:59 CEST 2012


Author: alec
Date: 2012-04-19 01:38:59 -0500 (Thu, 19 Apr 2012)
New Revision: 6100

Modified:
   trunk/roundcubemail/program/steps/mail/get.inc
Log:
- Fix attachment name regression (#1488446)


Modified: trunk/roundcubemail/program/steps/mail/get.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/get.inc	2012-04-18 17:53:29 UTC (rev 6099)
+++ trunk/roundcubemail/program/steps/mail/get.inc	2012-04-19 06:38:59 UTC (rev 6100)
@@ -151,11 +151,10 @@
         $filename = rcube_label('htmlmessage');
       }
       else {
-        $filename = ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube');
+        $ext = '.' . ($mimetype == 'text/plain' ? 'txt' : $ctype_secondary);
+        $filename = ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube') . $ext;
       }
 
-      $ext      = '.' . ($mimetype == 'text/plain' ? 'txt' : $ctype_secondary);
-      $filename .= $ext;
       $filename = preg_replace('[\r\n]', '', $filename);
 
       if ($browser->ie && $browser->ver < 7)



More information about the svn mailing list