Changeset 31770

Timestamp:

03/13/2015 06:28:52 PM (10 years ago)

Author:

SergeyBiryukov

Message:

Restore line breaks before comment text in comment notification emails.

fixes #31508.

File:

• trunk/src/wp-includes/pluggable.php (modified) (4 diffs)

trunk/src/wp-includes/pluggable.php

@@ -1421 +1421 @@
             $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
             $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-            $notify_message .= sprintf( __( 'Comment: %s' ), $comment->comment_content ) . "\r\n\r\n";
+            $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
             $notify_message .= __( 'You can see all trackbacks on this post here:' ) . "\r\n";
             /* translators: 1: blog name, 2: post title */
@@ -1431 +1431 @@
             $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
             $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-            $notify_message .= sprintf( __( 'Comment: %s' ), $comment->comment_content ) . "\r\n\r\n";
+            $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
             $notify_message .= __( 'You can see all pingbacks on this post here:' ) . "\r\n";
             /* translators: 1: blog name, 2: post title */
@@ -1443 +1443 @@
             $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
             $notify_message .= sprintf( __( 'Whois: %s' ), "http://whois.arin.net/rest/ip/{$comment->comment_author_IP}" ) . "\r\n";
-            $notify_message .= sprintf( __('Comment: %s' ), $comment->comment_content ) . "\r\n\r\n";
+            $notify_message .= sprintf( __('Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
             $notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n";
             /* translators: 1: blog name, 2: post title */
@@ -1572 +1572 @@
             $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
             $notify_message .= sprintf( __( 'Whois: %s' ), "http://whois.arin.net/rest/ip/{$comment->comment_author_IP}" ) . "\r\n";
-            $notify_message .= sprintf( __( 'Comment: %s' ), $comment->comment_content ) . "\r\n\r\n";
+            $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
             break;
     }