Changeset 47114

Timestamp:

01/27/2020 04:31:48 AM (7 years ago)

Author:

SergeyBiryukov

Message:

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 #43805. See #43429.

Location:

trunk

Files:

• src/wp-includes/pluggable.php (modified) (7 diffs)
• tests/phpunit/tests/comment.php (modified) (2 diffs)

trunk/src/wp-includes/pluggable.php

@@ -1585 +1585 @@
                                 $subject = sprintf( __( '[%1$s] Trackback: "%2$s"' ), $blogname, $post->post_title );
                                 break;
+
                         case 'pingback':
                                 /* translators: %s: Post title. */
@@ -1598 +1599 @@
                                 $subject = sprintf( __( '[%1$s] Pingback: "%2$s"' ), $blogname, $post->post_title );
                                 break;
+
                         default: // Comments
                                 /* translators: %s: Post title. */
@@ -1607 +1609 @@
                                 /* 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";
@@ -1614 +1622 @@
                                 break;
                 }
+
                 $notify_message .= get_permalink( $comment->comment_post_ID ) . "#comments\r\n\r\n";
                 /* translators: %s: Comment URL. */
@@ -1762 +1771 @@
                                 $notify_message .= __( 'Trackback excerpt: ' ) . "\r\n" . $comment_content . "\r\n\r\n";
                                 break;
+
                         case 'pingback':
                                 /* translators: %s: Post title. */
@@ -1772 +1782 @@
                                 $notify_message .= __( 'Pingback excerpt: ' ) . "\r\n" . $comment_content . "\r\n\r\n";
                                 break;
+
                         default: // Comments
                                 /* translators: %s: Post title. */
@@ -1782 +1793 @@
                                 /* 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";

trunk/tests/phpunit/tests/comment.php

@@ -7 +7 @@
         protected static $user_id;
         protected static $post_id;
+        protected static $notify_message = '';
 
         public function setUp() {
@@ -433 +434 @@
                 $sent = wp_new_comment_notify_postauthor( $c );
                 $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;
         }