mirror of
https://github.com/WordPress/WordPress.git
synced 2024-12-23 09:37:42 +01:00
Use reply-to instead of from to stop acting spammy - fixes #1593
git-svn-id: http://svn.automattic.com/wordpress/trunk@3035 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
c50e7da21b
commit
98945dd8b4
@ -282,11 +282,17 @@ function wp_notify_postauthor($comment_id, $comment_type='') {
|
|||||||
$notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
|
$notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
|
||||||
$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";
|
$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) {
|
$admin_email = get_settings('admin_email');
|
||||||
$from = "From: \"$blogname\" <wordpress@" . $_SERVER['SERVER_NAME'] . '>';
|
|
||||||
} else {
|
if ( '' == $comment->comment_author ) {
|
||||||
$from = 'From: "' . $comment->comment_author . "\" <$comment->comment_author_email>";
|
$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"
|
$message_headers = "MIME-Version: 1.0\n"
|
||||||
. "$from\n"
|
. "$from\n"
|
||||||
|
Loading…
Reference in New Issue
Block a user