Changeset 5358 in subversion

Timestamp:

Oct 21, 2011 1:29:21 PM (19 months ago)

Author:

alec

Message:

• Small code improvement

File:

• trunk/roundcubemail/program/include/rcube_imap.php (modified) (2 diffs)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -2321 +2321 @@
         // decode filename
         if (!empty($filename_mime)) {
-            $part->filename = rcube_imap::decode_mime_string($filename_mime,
-                $part->charset ? $part->charset : ($this->struct_charset ? $this->struct_charset :
-                rc_detect_encoding($filename_mime, $this->default_charset)));
+            if (!empty($part->charset))
+                $charset = $part->charset;
+            else if (!empty($this->struct_charset))
+                $charset = $this->struct_charset;
+            else
+                $charset = rc_detect_encoding($filename_mime, $this->default_charset);
+
+            $part->filename = rcube_imap::decode_mime_string($filename_mime, $charset);
         }
         else if (!empty($filename_encoded)) {
@@ -2331 +2336 @@
                 $filename_encoded = $fmatches[2];
             }
+
             $part->filename = rcube_charset_convert(urldecode($filename_encoded), $filename_charset);
         }