WordPress.org

Make WordPress Core

Ticket #33717: 33717.2.diff

File 33717.2.diff, 4.1 KB (added by swissspidy, 6 years ago)
  • src/wp-includes/comment-functions.php

    diff --git src/wp-includes/comment-functions.php src/wp-includes/comment-functions.php
    index 1259995..54c2d9e 100644
    function _close_comments_for_old_post( $open, $post_id ) { 
    23912391
    23922392        return $open;
    23932393}
     2394
     2395/**
     2396 * Notify a comment author when his comment gets approved.
     2397 *
     2398 * @since 4.4.0
     2399 *
     2400 * @param string     $new_status New comment status.
     2401 * @param string     $old_status Previous comment status.
     2402 * @param WP_Comment $comment    Comment object.
     2403 * @return bool Whether the email was sent successfully.
     2404 */
     2405function wp_notify_commenter( $new_status, $old_status, $comment ) {
     2406        if ( 'approved' !== $new_status ) {
     2407                return false;
     2408        }
     2409
     2410        $post = get_post( $comment->comment_post_ID );
     2411
     2412        if ( ! $post ) {
     2413                return false;
     2414        }
     2415
     2416        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
     2417        // we want to reverse this for the plain text arena of emails.
     2418        $blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
     2419
     2420        /* translators: 1: blog name, 2: post title */
     2421        $subject = sprintf( __( '[%1$s] Your comment on "%2$s" got approved' ), $blogname, $post->post_title );
     2422
     2423        $notify_message = sprintf( __( 'Howdy %s,' ), $comment->comment_author ) . "\r\n\r\n";
     2424        $notify_message .= sprintf( __( 'Your comment on the post "%1$s" got approved.' ), $post->post_title ) . "\r\n\r\n";
     2425        /* translators: 1: comment author, 2: author IP, 3: author domain */
     2426        $notify_message .= sprintf( __( 'View comment: %s' ), get_comment_link( $comment ) ) . "\r\n";
     2427
     2428        /**
     2429         * Filter the comment approval notification email text.
     2430         *
     2431         * @since 4.4.0
     2432         *
     2433         * @param string     $notify_message The comment notification email text.
     2434         * @param WP_Comment $comment        Comment object.
     2435         */
     2436        $notify_message = apply_filters( 'comment_approval_notification_text', $notify_message, $comment );
     2437
     2438        /**
     2439         * Filter the comment approval notification email subject.
     2440         *
     2441         * @since 4.4.0
     2442         *
     2443         * @param string     $subject The comment notification email subject.
     2444         * @param WP_Comment $comment Comment object.
     2445         */
     2446        $subject = apply_filters( 'comment_approval_notification_subject', $subject, $comment );
     2447
     2448        return wp_mail( $comment->comment_author_email, wp_specialchars_decode( $subject ), $notify_message );
     2449}
  • src/wp-includes/comment-template.php

    diff --git src/wp-includes/comment-template.php src/wp-includes/comment-template.php
    index 5c59348..016b56e 100644
    class Walker_Comment extends Walker { 
    19281928                        <?php printf( __( '<cite class="fn">%s</cite> <span class="says">says:</span>' ), get_comment_author_link() ); ?>
    19291929                </div>
    19301930                <?php if ( '0' == $comment->comment_approved ) : ?>
    1931                 <em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ) ?></em>
     1931                <em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation. You will receive an email when it gets approved.' ) ?></em>
    19321932                <br />
    19331933                <?php endif; ?>
    19341934
    class Walker_Comment extends Walker { 
    19931993                                        </div><!-- .comment-metadata -->
    19941994
    19951995                                        <?php if ( '0' == $comment->comment_approved ) : ?>
    1996                                         <p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ); ?></p>
     1996                                        <p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation. You will receive an email when it gets approved.' ); ?></p>
    19971997                                        <?php endif; ?>
    19981998                                </footer><!-- .comment-meta -->
    19991999
  • src/wp-includes/default-filters.php

    diff --git src/wp-includes/default-filters.php src/wp-includes/default-filters.php
    index b6f0ce3..8fc95e2 100644
    add_action( 'split_shared_term', '_wp_check_split_terms_in_menus', 10, 4 ); 
    334334add_action( 'split_shared_term', '_wp_check_split_nav_menu_terms', 10, 4 );
    335335add_action( 'wp_split_shared_term_batch', '_wp_batch_split_terms' );
    336336
     337// Comments.
     338add_action( 'transition_comment_status', 'wp_notify_commenter', 10, 3 );
     339
    337340/**
    338341 * Filters formerly mixed into wp-includes
    339342 */