WordPress.org

Make WordPress Core

Changeset 6281 for trunk/wp-mail.php


Ignore:
Timestamp:
10/21/2007 06:18:59 AM (14 years ago)
Author:
ryan
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-mail.php

    r6217 r6281  
    6161            }
    6262
    63             // Set the author using the email address (To or Reply-To, the last used)
     63            // Set the author using the email address (From or Reply-To, the last used)
    6464            // otherwise use the site admin
    6565            if ( preg_match('/(From|Reply-To): /', $line) )  {
    66                 $author = sanitize_email(preg_replace('/(From|Reply-To): /', '', $line));
     66                if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) )
     67                    $author = $matches[0];
     68                else
     69                    $author = trim($line);
     70                $author = sanitize_email($author);
    6771                if ( is_email($author) ) {
    6872                    echo "Author = {$author} <p>";
Note: See TracChangeset for help on using the changeset viewer.