Ticket #5169: wp-mail.php.3.diff

wp-mail.php

@@ -60 +60 @@
                                 $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);