- Fix handling of email addresses with quoted local part (#1487939)

release-0.6
alecpl 13 years ago
parent 6d0ada30d7
commit 2185899721

@ -4772,7 +4772,7 @@ class rcube_imap
$address = $m[2]; $address = $m[2];
$name = trim($m[1]); $name = trim($m[1]);
} }
else if (preg_match('/^(\S+@\S+)$/', $val, $m)) { else if (preg_match('/^('.$email_rx.')$/', $val, $m)) {
$address = $m[1]; $address = $m[1];
$name = ''; $name = '';
} }

@ -46,6 +46,8 @@ class rcube_test_maildecode extends UnitTestCase
18 => '"Test,Test" <test@domain.tld>', 18 => '"Test,Test" <test@domain.tld>',
// 1487939 // 1487939
19 => 'Test <"test test"@domain.tld>', 19 => 'Test <"test test"@domain.tld>',
20 => '<"test test"@domain.tld>',
21 => '"test test"@domain.tld',
); );
$results = array( $results = array(
@ -69,6 +71,8 @@ class rcube_test_maildecode extends UnitTestCase
17 => array(1, '', 'test@domain.tld'), 17 => array(1, '', 'test@domain.tld'),
18 => array(1, 'Test,Test', 'test@domain.tld'), 18 => array(1, 'Test,Test', 'test@domain.tld'),
19 => array(1, 'Test', '"test test"@domain.tld'), 19 => array(1, 'Test', '"test test"@domain.tld'),
20 => array(1, '', '"test test"@domain.tld'),
21 => array(1, '', '"test test"@domain.tld'),
); );
foreach ($headers as $idx => $header) { foreach ($headers as $idx => $header) {

Loading…
Cancel
Save