sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix email address parsing in wp-mail.php. Props Bobcat. fixes #5169

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@6281 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2007-10-21 06:18:59 +00:00
parent c9039f96d1
commit 8878de4cf3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-mail.php
View File

@ -60,10 +60,14 @@ for ($i=1; $i <= $count; $i++) :
$subject = $subject[0]; $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 // otherwise use the site admin
if ( preg_match('/(From|Reply-To): /', $line) ) { 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) ) { if ( is_email($author) ) {
echo "Author = {$author} <p>"; echo "Author = {$author} <p>";
$author = $wpdb->escape($author); $author = $wpdb->escape($author);