From 88735ac45a9020b01a1df68ca4ca04d6518f1a27 Mon Sep 17 00:00:00 2001
From: markjaquith <markjaquith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 10 Oct 2007 16:46:20 +0000
Subject: [PATCH] Strip From/Reply-To from e-mail before sanitizing in
 wp-mail.php.  Props Bobcat.  fixes #5169

git-svn-id: http://svn.automattic.com/wordpress/trunk@6217 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-mail.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-mail.php b/wp-mail.php
index 94dac0485a..7e046370f4 100644
--- a/wp-mail.php
+++ b/wp-mail.php
@@ -62,8 +62,8 @@ for ($i=1; $i <= $count; $i++) :
 
 			// Set the author using the email address (To or Reply-To, the last used)
 			// otherwise use the site admin
-			if (preg_match('/From: /', $line) | preg_match('/Reply-To: /', $line))  {
-				$author = sanitize_email($line);
+			if ( preg_match('/(From|Reply-To): /', $line) )  {
+				$author = sanitize_email(preg_replace('/(From|Reply-To): /', '', $line));
 				if ( is_email($author) ) {
 					echo "Author = {$author} <p>";
 					$author = $wpdb->escape($author);