<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[47114] trunk: Comments: Add `In reply to: %s` parent comment link to new comment email notifications.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/47114">47114</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/47114","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-01-27 04:31:48 +0000 (Mon, 27 Jan 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Comments: Add `In reply to: %s` parent comment link to new comment email notifications.
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 <a href="https://core.trac.wordpress.org/ticket/43805">#43805</a>. See <a href="https://core.trac.wordpress.org/ticket/43429">#43429</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunktestsphpunittestscommentphp">trunk/tests/phpunit/tests/comment.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2020-01-27 01:04:08 UTC (rev 47113)
+++ trunk/src/wp-includes/pluggable.php 2020-01-27 04:31:48 UTC (rev 47114)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1584,6 +1584,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Trackback notification email subject. 1: Site title, 2: Post title. */
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = sprintf( __( '[%1$s] Trackback: "%2$s"' ), $blogname, $post->post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'pingback':
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Post title. */
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1597,6 +1598,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Pingback notification email subject. 1: Site title, 2: Post title. */
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = sprintf( __( '[%1$s] Pingback: "%2$s"' ), $blogname, $post->post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> default: // Comments
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Post title. */
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1606,6 +1608,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Trackback/pingback/comment author URL. */
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 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";
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Comment text. */
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1613,6 +1621,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = sprintf( __( '[%1$s] Comment: "%2$s"' ), $blogname, $post->post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= get_permalink( $comment->comment_post_ID ) . "#comments\r\n\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Comment URL. */
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Permalink: %s' ), get_comment_link( $comment ) ) . "\r\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1761,6 +1770,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= __( 'Trackback excerpt: ' ) . "\r\n" . $comment_content . "\r\n\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'pingback':
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Post title. */
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message = sprintf( __( 'A new pingback on the post "%s" is waiting for your approval' ), $post->post_title ) . "\r\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1771,6 +1781,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= __( 'Pingback excerpt: ' ) . "\r\n" . $comment_content . "\r\n\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> default: // Comments
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Post title. */
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message = sprintf( __( 'A new comment on the post "%s" is waiting for your approval' ), $post->post_title ) . "\r\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1781,6 +1792,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Trackback/pingback/comment author URL. */
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 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";
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Comment text. */
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span></span></pre></div>
<a id="trunktestsphpunittestscommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment.php 2020-01-27 01:04:08 UTC (rev 47113)
+++ trunk/tests/phpunit/tests/comment.php 2020-01-27 04:31:48 UTC (rev 47114)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,6 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Comment extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $user_id;
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $post_id;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static $notify_message = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -435,6 +436,66 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12431
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_new_comment_with_meta() {
</span></span></pre>
</div>
</div>
</body>
</html>