Skip to content
Browse files

Anchor a regular expression in wp-mail.php to ensure we are matching …

…the Reply-To: header, not the In-Reply-To: header.

Per RFCs *822, mail headers must start at the beginning of a line. This same pattern could be continued throughout this file.

props solarissmoke.
fixes #18923.



git-svn-id: http://core.svn.wordpress.org/trunk@20682 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent 5a37c2f commit 95ab5d397e26e86818533ccf19ff56eb638f1049 nacin committed May 2, 2012
Showing with 2 additions and 6 deletions.
  1. +2 −6 wp-mail.php
View
8 wp-mail.php
@@ -105,7 +105,7 @@
// 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) ) {
+ if ( ! $author_found && preg_match( '/^(From|Reply-To): /', $line ) ) {
if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) )
$author = $matches[0];
else
@@ -114,14 +114,10 @@
if ( is_email($author) ) {
echo '<p>' . sprintf(__('Author is %s'), $author) . '</p>';
$userdata = get_user_by('email', $author);
- if ( empty($userdata) ) {
- $author_found = false;
- } else {
+ if ( ! empty( $userdata ) ) {
$post_author = $userdata->ID;
$author_found = true;
}
- } else {
- $author_found = false;
}
}

0 comments on commit 95ab5d3

Please sign in to comment.
Something went wrong with that request. Please try again.