sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Comments: Add In reply to: %s parent comment link to new comment email notifications.

Browse Source 
This information was previously available on the Moderate Comment screen in the admin, but was missing from moderation emails.

Props imath, danieltj, andraganescu, galbaras, SergeyBiryukov.
Fixes #43805. See #43429.

git-svn-id: https://develop.svn.wordpress.org/trunk@47114 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2020-01-27 04:31:48 +00:00
parent 191f798201
commit d5e20d8ab5
2 changed files with 78 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/wp-includes/pluggable.php
View File

@ -1584,6 +1584,7 @@ if ( ! function_exists( 'wp_notify_postauthor' ) ) :
/* translators: Trackback notification email subject. 1: Site title, 2: Post title. */
$subject = sprintf( __( '[%1$s] Trackback: "%2$s"' ), $blogname, $post->post_title );
break;
case 'pingback':
/* translators: %s: Post title. */
$notify_message = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n";
@ -1597,6 +1598,7 @@ if ( ! function_exists( 'wp_notify_postauthor' ) ) :
/* translators: Pingback notification email subject. 1: Site title, 2: Post title. */
$subject = sprintf( __( '[%1$s] Pingback: "%2$s"' ), $blogname, $post->post_title );
break;
default: // Comments
/* translators: %s: Post title. */
$notify_message = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
@ -1606,6 +1608,12 @@ if ( ! function_exists( 'wp_notify_postauthor' ) ) :
$notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
/* translators: %s: Trackback/pingback/comment author URL. */
$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
if ( $comment->comment_parent && user_can( $post->post_author, 'edit_comment', $comment->comment_parent ) ) {
/* translators: Comment moderation. %s: Parent comment edit URL. */
$notify_message .= sprintf( __( 'In reply to: %s' ), admin_url( "comment.php?action=editcomment&c={$comment->comment_parent}#wpbody-content" ) ) . "\r\n";
}
/* translators: %s: Comment text. */
$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
$notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n";
@ -1613,6 +1621,7 @@ if ( ! function_exists( 'wp_notify_postauthor' ) ) :
$subject = sprintf( __( '[%1$s] Comment: "%2$s"' ), $blogname, $post->post_title );
break;
}
$notify_message .= get_permalink( $comment->comment_post_ID ) . "#comments\r\n\r\n";
/* translators: %s: Comment URL. */
$notify_message .= sprintf( __( 'Permalink: %s' ), get_comment_link( $comment ) ) . "\r\n";
@ -1761,6 +1770,7 @@ if ( ! function_exists( 'wp_notify_moderator' ) ) :
$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
$notify_message .= __( 'Trackback excerpt: ' ) . "\r\n" . $comment_content . "\r\n\r\n";
break;
case 'pingback':
/* translators: %s: Post title. */
$notify_message = sprintf( __( 'A new pingback on the post "%s" is waiting for your approval' ), $post->post_title ) . "\r\n";
@ -1771,6 +1781,7 @@ if ( ! function_exists( 'wp_notify_moderator' ) ) :
$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
$notify_message .= __( 'Pingback excerpt: ' ) . "\r\n" . $comment_content . "\r\n\r\n";
break;
default: // Comments
/* translators: %s: Post title. */
$notify_message = sprintf( __( 'A new comment on the post "%s" is waiting for your approval' ), $post->post_title ) . "\r\n";
@ -1781,6 +1792,12 @@ if ( ! function_exists( 'wp_notify_moderator' ) ) :
$notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
/* translators: %s: Trackback/pingback/comment author URL. */
$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
if ( $comment->comment_parent ) {
/* translators: Comment moderation. %s: Parent comment edit URL. */
$notify_message .= sprintf( __( 'In reply to: %s' ), admin_url( "comment.php?action=editcomment&c={$comment->comment_parent}#wpbody-content" ) ) . "\r\n";
}
/* translators: %s: Comment text. */
$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
break;

61
tests/phpunit/tests/comment.php
View File

@ -6,6 +6,7 @@
class Tests_Comment extends WP_UnitTestCase {
protected static $user_id;
protected static $post_id;
protected static $notify_message = '';
public function setUp() {
parent::setUp();
@ -434,6 +435,66 @@ class Tests_Comment extends WP_UnitTestCase {
$this->assertFalse( $sent );
}
/**
* @ticket 43805
*/
public function test_wp_new_comment_notify_postauthor_content_should_include_link_to_parent() {
$c1 = self::factory()->comment->create(
array(
'comment_post_ID' => self::$post_id,
)
);
$c2 = self::factory()->comment->create(
array(
'comment_post_ID' => self::$post_id,
'comment_parent' => $c1,
)
);
add_filter( 'comment_notification_text', array( $this, 'save_comment_notification_text' ) );
wp_new_comment_notify_postauthor( $c2 );
remove_filter( 'comment_notification_text', array( $this, 'save_comment_notification_text' ) );
$this->assertContains( admin_url( "comment.php?action=editcomment&c={$c1}" ), self::$notify_message );
}
/**
* @ticket 43805
*/
public function test_wp_new_comment_notify_moderator_content_should_include_link_to_parent() {
$c1 = self::factory()->comment->create(
array(
'comment_post_ID' => self::$post_id,
)
);
$c2 = self::factory()->comment->create(
array(
'comment_post_ID' => self::$post_id,
'comment_parent' => $c1,
'comment_approved' => '0',
)
);
add_filter( 'comment_moderation_text', array( $this, 'save_comment_notification_text' ) );
wp_new_comment_notify_moderator( $c2 );
remove_filter( 'comment_moderation_text', array( $this, 'save_comment_notification_text' ) );
$this->assertContains( admin_url( "comment.php?action=editcomment&c={$c1}" ), self::$notify_message );
}
/**
* Callback for the `comment_notification_text` & `comment_moderation_text` filters.
*
* @param string $notify_message The comment notification or moderation email text.
* @return string
*/
public function save_comment_notification_text( $notify_message = '' ) {
self::$notify_message = $notify_message;
return $notify_message;
}
/**
* @ticket 12431
*/