Changeset 6280

Timestamp:

10/21/2007 06:18:08 AM (17 years ago)

Author:

ryan

Message:

Allow hypens in email addresses. Props Bobcat. fixes #5169 for 2.3

File:

• branches/2.3/wp-mail.php (modified) (1 diff)

branches/2.3/wp-mail.php

@@ -61 +61 @@
             }
 
-            // 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: /', $line) | preg_match('/Reply-To: /', $line))  {
-                $author=trim($line);
-                if ( ereg("([a-zA-Z0-9\_\-\.]+@[\a-zA-z0-9\_\-\.]+)", $author , $regs) ) {
-                    $author = $regs[1];
+            if ( preg_match('/(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);