From 062d072c1c52899cc9f360eb8c9590aff7bb2ee3 Mon Sep 17 00:00:00 2001 From: ryan Date: Sun, 19 Aug 2007 22:26:25 +0000 Subject: [PATCH] Formatting cleanups from johnjosephbachir. fixes #4775 for 2.2 git-svn-id: http://svn.automattic.com/wordpress/branches/2.2@5902 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-mail.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/wp-mail.php b/wp-mail.php index 8795c74f4f..ebe81bd82a 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}

"; - $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}

"; + $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'