From a92c487cc0101772005bf9f44215d7e797809563 Mon Sep 17 00:00:00 2001 From: ryan Date: Sun, 21 Oct 2007 06:18:59 +0000 Subject: [PATCH] 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 --- wp-mail.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wp-mail.php b/wp-mail.php index 7e046370f4..e5100558d1 100644 --- a/wp-mail.php +++ b/wp-mail.php @@ -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}

"; $author = $wpdb->escape($author);