diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-09-10 18:26:30 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-09-10 18:26:30 +0000 |
| commit | b658e546840b8f23e2a1e413f6510104d73ea91f (patch) | |
| tree | 1cd6bbbda247b5ae6cfff42f2cea731b4d8b667f /wp-mail.php | |
| parent | 305d7e7228e097a26a98abdb45eb8283df7d5603 (diff) | |
| download | wordpress-mu-b658e546840b8f23e2a1e413f6510104d73ea91f.tar.gz wordpress-mu-b658e546840b8f23e2a1e413f6510104d73ea91f.tar.xz wordpress-mu-b658e546840b8f23e2a1e413f6510104d73ea91f.zip | |
Sync with WP 2.2.3
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1051 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-mail.php')
| -rw-r--r-- | wp-mail.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/wp-mail.php b/wp-mail.php index 8795c74..ebe81bd 100644 --- a/wp-mail.php +++ b/wp-mail.php @@ -64,17 +64,17 @@ for ($i=1; $i <= $count; $i++) : // 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]; - echo "Author = {$author} <p>"; - $author = $wpdb->escape($author); - $result = $wpdb->get_row("SELECT ID FROM $wpdb->users WHERE user_email='$author' LIMIT 1"); - if (!$result) + if ( ereg("([a-zA-Z0-9\_\-\.]+@[\a-zA-z0-9\_\-\.]+)", $author , $regs) ) { + $author = $regs[1]; + echo "Author = {$author} <p>"; + $author = $wpdb->escape($author); + $result = $wpdb->get_row("SELECT ID FROM $wpdb->users WHERE user_email='$author' LIMIT 1"); + if (!$result) + $post_author = 1; + else + $post_author = $result->ID; + } else $post_author = 1; - else - $post_author = $result->ID; - } else - $post_author = 1; } if (preg_match('/Date: /i', $line)) { // of the form '20 Mar 2002 20:32:37' |