Changeset 5038 in subversion for trunk/roundcubemail/program/lib/Mail/mimePart.php

Timestamp:

Aug 10, 2011 4:06:00 AM (22 months ago)

Author:

alec

Message:

• Mail_Mime-1.8.2

File:

• trunk/roundcubemail/program/lib/Mail/mimePart.php (modified) (3 diffs)

trunk/roundcubemail/program/lib/Mail/mimePart.php

@@ -146 +146 @@
     *     cid               - Content ID to apply
     *     disposition       - Content disposition, inline or attachment
-    *     dfilename         - Filename parameter for content disposition
+    *     filename          - Filename parameter for content disposition
     *     description       - Content description
     *     name_encoding     - Encoding of the attachment name (Content-Type)
@@ -187 +187 @@
                 $this->_body_file = $value;
                 break;
+
+            // for backward compatibility
+            case 'dfilename':
+                $params['filename'] = $value;
+                break;
             }
         }
@@ -803 +808 @@
         if (!empty($separator)) {
             // Simple e-mail address regexp
-            $email_regexp = '(\S+|("\s*(?:[^"\f\n\r\t\v\b\s]+\s*)+"))@\S+';
+            $email_regexp = '(\S+|("[^\r\n"]+"))@\S+';
 
             $parts = Mail_mimePart::_explodeQuotedString($separator, $value);