Changeset 3035

Timestamp:

11/11/2005 12:07:39 AM (20 years ago)

Author:

matt

Message:

Use reply-to instead of from to stop acting spammy - fixes #1593

File:

• trunk/wp-includes/pluggable-functions.php (modified) (1 diff)

trunk/wp-includes/pluggable-functions.php

@@ -283 +283 @@
     $notify_message .= sprintf( __('To delete this comment, visit: %s'), get_settings('siteurl').'/wp-admin/post.php?action=confirmdeletecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";
 
-    if ('' == $comment->comment_author_email || '' == $comment->comment_author) {
-        $from = "From: \"$blogname\" <wordpress@" . $_SERVER['SERVER_NAME'] . '>';
-    } else {
-        $from = 'From: "' . $comment->comment_author . "\" <$comment->comment_author_email>";
-    }
+    $admin_email = get_settings('admin_email');
+
+    if ( '' == $comment->comment_author ) {
+        $from = "From: \"$blogname\" <$admin_email>";
+        if ( '' != $comment->comment_author_email )
+            $reply_to = "Reply-To: $comment->comment_author_email";
+    } else {
+        $from = "From: \"$comment->comment_author\" <$admin_email>";
+        if ( '' != $comment->comment_author_email )
+            $reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_email>";
+    }
 
     $message_headers = "MIME-Version: 1.0\n"