Fix email address parsing in wp-mail.php. Props Bobcat. fixes #5169
git-svn-id: http://svn.automattic.com/wordpress/trunk@6281 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
c75ec2b48a
commit
a92c487cc0
|
@ -60,10 +60,14 @@ for ($i=1; $i <= $count; $i++) :
|
|||
$subject = $subject[0];
|
||||
}
|
||||
|
||||
// Set the author using the email address (To or Reply-To, the last used)
|
||||
// Set the author using the email address (From or Reply-To, the last used)
|
||||
// otherwise use the site admin
|
||||
if ( preg_match('/(From|Reply-To): /', $line) ) {
|
||||
$author = sanitize_email(preg_replace('/(From|Reply-To): /', '', $line));
|
||||
if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) )
|
||||
$author = $matches[0];
|
||||
else
|
||||
$author = trim($line);
|
||||
$author = sanitize_email($author);
|
||||
if ( is_email($author) ) {
|
||||
echo "Author = {$author} <p>";
|
||||
$author = $wpdb->escape($author);
|
||||
|
|
Loading…
Reference in New Issue