Browse files

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
  • Loading branch information...
1 parent c75ec2b commit a92c487cc0101772005bf9f44215d7e797809563 ryan committed Oct 21, 2007
Showing with 6 additions and 2 deletions.
  1. +6 −2 wp-mail.php
View
8 wp-mail.php
@@ -60,10 +60,14 @@
$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);

0 comments on commit a92c487

Please sign in to comment.