diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-02-23 14:20:43 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-02-24 14:16:10 +0100 |
| commit | 55d9d5e0b7c75d7a4a2f59a76a8fdc793bf78b43 (patch) | |
| tree | 52031853949f5fb459137261e39a33d77b28b9af /program/lib | |
| parent | 5f5174e3b537a5ec87c6d7bd6cbc898a47725fd5 (diff) | |
Improvement in handling invalid email address strings
Diffstat (limited to 'program/lib')
| -rw-r--r-- | program/lib/Roundcube/rcube_mime.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php index 55b70f67c..091b2fae8 100644 --- a/program/lib/Roundcube/rcube_mime.php +++ b/program/lib/Roundcube/rcube_mime.php @@ -366,6 +366,9 @@ class rcube_mime $address = 'MAILER-DAEMON'; $name = substr($val, 0, -strlen($m[1])); } + else if (preg_match('/('.$email_rx.')/', $val, $m)) { + $name = $m[1]; + } else { $name = $val; } @@ -387,6 +390,7 @@ class rcube_mime if (!$address && $name) { $address = $name; + $name = ''; } if ($address) { |