WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Comments: Revert the introduction of the opt-in comment approval notification feature. 

This reverts the following commits: [50113], [50112], [50109].

See #33717

Built from https://develop.svn.wordpress.org/trunk@50375


git-svn-id: http://core.svn.wordpress.org/trunk@49986 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2021-02-17 13:08:05 +00:00
parent dcbe3cb7b8
commit dd53775247
5 changed files with 46 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
wp-comments-post.php
View File

@ -22,55 +22,38 @@ require __DIR__ . '/wp-load.php';
nocache_headers(); nocache_headers();
if ( isset( $_POST['wp-comment-approved-notification-optin'], $_POST['comment_ID'], $_POST['moderation-hash'] ) ) { $comment = wp_handle_comment_submission( wp_unslash( $_POST ) );
$comment = get_comment( $_POST['comment_ID'] ); if ( is_wp_error( $comment ) ) {
$data = (int) $comment->get_error_data();
if ( $comment && hash_equals( $_POST['moderation-hash'], wp_hash( $comment->comment_date_gmt ) ) ) { if ( ! empty( $data ) ) {
update_comment_meta( $comment->comment_ID, '_wp_comment_author_notification_optin', true );
} else {
wp_die( wp_die(
'<p>' . __( 'Invalid comment ID.' ) . '</p>', '<p>' . $comment->get_error_message() . '</p>',
__( 'Comment Notification Opt-in Failure' ), __( 'Comment Submission Failure' ),
array( array(
'response' => 404, 'response' => $data,
'back_link' => true, 'back_link' => true,
) )
); );
} else {
exit;
} }
} else {
$comment = wp_handle_comment_submission( wp_unslash( $_POST ) );
if ( is_wp_error( $comment ) ) {
$data = (int) $comment->get_error_data();
if ( ! empty( $data ) ) {
wp_die(
'<p>' . $comment->get_error_message() . '</p>',
__( 'Comment Submission Failure' ),
array(
'response' => $data,
'back_link' => true,
)
);
} else {
exit;
}
}
$user = wp_get_current_user();
$cookies_consent = ( isset( $_POST['wp-comment-cookies-consent'] ) );
/**
* Perform other actions when comment cookies are set.
*
* @since 3.4.0
* @since 4.9.6 The `$cookies_consent` parameter was added.
*
* @param WP_Comment $comment Comment object.
* @param WP_User $user Comment author's user object. The user may not exist.
* @param bool $cookies_consent Comment author's consent to store cookies.
*/
do_action( 'set_comment_cookies', $comment, $user, $cookies_consent );
} }
$user = wp_get_current_user();
$cookies_consent = ( isset( $_POST['wp-comment-cookies-consent'] ) );
/**
* Perform other actions when comment cookies are set.
*
* @since 3.4.0
* @since 4.9.6 The `$cookies_consent` parameter was added.
*
* @param WP_Comment $comment Comment object.
* @param WP_User $user Comment author's user object. The user may not exist.
* @param bool $cookies_consent Comment author's consent to store cookies.
*/
do_action( 'set_comment_cookies', $comment, $user, $cookies_consent );
$location = empty( $_POST['redirect_to'] ) ? get_comment_link( $comment ) : $_POST['redirect_to'] . '#comment-' . $comment->comment_ID; $location = empty( $_POST['redirect_to'] ) ? get_comment_link( $comment ) : $_POST['redirect_to'] . '#comment-' . $comment->comment_ID;
// If user didn't consent to cookies, add specific query arguments to display the awaiting moderation message. // If user didn't consent to cookies, add specific query arguments to display the awaiting moderation message.

132
wp-includes/class-walker-comment.php
View File

@ -40,16 +40,6 @@ class Walker_Comment extends Walker {
'id' => 'comment_ID', 'id' => 'comment_ID',
); );
/**
* Whether the comment approval notification opt-in form or message needs to be
* output automatically.
*
* @since 5.7.0
*
* @var bool
*/
protected $needs_comment_approval_notification_output = true;
/** /**
* Starts the list before the elements are added. * Starts the list before the elements are added.
* *
@ -265,13 +255,10 @@ class Walker_Comment extends Walker {
/** /**
* Filters the comment text. * Filters the comment text.
* *
* - Removes links from the pending comment's text if the commenter did not consent * Removes links from the pending comment's text if the commenter did not consent
* to the comment cookies * to the comment cookies.
* - Prepends the approval notification opt-in form or message to pending comments
* *
* @since 5.4.2 * @since 5.4.2
* @since 5.7.0 Comment approval notification opt-in form is now automatically
* appended if necessary.
* *
* @param string $comment_text Text of the current comment. * @param string $comment_text Text of the current comment.
* @param WP_Comment|null $comment The comment object. Null if not found. * @param WP_Comment|null $comment The comment object. Null if not found.
@ -285,90 +272,9 @@ class Walker_Comment extends Walker {
$comment_text = wp_kses( $comment_text, array() ); $comment_text = wp_kses( $comment_text, array() );
} }
/*
* Checks if we need to output the comment approval notification opt-in form.
*/
if ( $this->needs_comment_approval_notification_output ) {
$comment_text = $this->comment_approval_notification_form( $comment ) . "\n" . $comment_text;
}
$this->needs_comment_approval_notification_output = true;
return $comment_text; return $comment_text;
} }
/**
* Outputs the awaiting moderation text.
*
* @since 5.7.0
*
* @param WP_Comment $comment Comment to display.
*/
protected function awaiting_moderation_text( $comment ) {
if ( '0' !== $comment->comment_approved ) {
return;
}
$commenter = wp_get_current_commenter();
if ( $commenter['comment_author_email'] ) {
$moderation_note = __( 'Your comment is awaiting moderation.' );
} else {
$moderation_note = __( 'Your comment is awaiting moderation. This is a preview, your comment will be visible after it has been approved.' );
}
printf(
'<em class="comment-awaiting-moderation">%s</em>',
esc_html( $moderation_note )
);
}
/**
* Gets the comment approval notification opt-in form or message for a pending comment.
*
* @since 5.7.0
*
* @param WP_Comment $comment Comment to display.
* @return string HTML output.
*/
protected function comment_approval_notification_form( $comment ) {
$comment_approval_output = '';
if ( '0' === $comment->comment_approved && has_action( 'comment_unapproved_to_approved', 'wp_new_comment_notify_comment_author' ) ) {
if ( get_comment_meta( $comment->comment_ID, '_wp_comment_author_notification_optin', true ) ) {
$comment_approval_output = sprintf(
'<p><em class="wp-comment-approved-notification-optedin">%s</em></p>',
esc_html__( 'You will receive an email when your comment is approved.' )
);
} else {
$comment_approval_output = sprintf(
'<form action="%1$s" method="post">
<p>
<input type="checkbox" id="wp-comment-approved-notification-optin" name="wp-comment-approved-notification-optin">
<label for="wp-comment-approved-notification-optin">
%2$s
</label>
</p>
<input type="hidden" name="comment_ID" value="%3$s">
<input type="hidden" name="moderation-hash" value="%4$s">
<input type="submit" class="button" value="%5$s">
</form>',
esc_url( site_url( '/wp-comments-post.php' ) ),
esc_html__( 'I want to be notified by email when my comment is approved.' ),
absint( $comment->comment_ID ),
wp_hash( $comment->comment_date_gmt ),
esc_html_x( 'Save', 'comment approval notification form' )
);
}
}
// Disable the backcompat output.
$this->needs_comment_approval_notification_output = false;
// Return the approval notification opt-in form.
return $comment_approval_output;
}
/** /**
* Outputs a single comment. * Outputs a single comment.
* *
@ -391,6 +297,12 @@ class Walker_Comment extends Walker {
$commenter = wp_get_current_commenter(); $commenter = wp_get_current_commenter();
$show_pending_links = isset( $commenter['comment_author'] ) && $commenter['comment_author']; $show_pending_links = isset( $commenter['comment_author'] ) && $commenter['comment_author'];
if ( $commenter['comment_author_email'] ) {
$moderation_note = __( 'Your comment is awaiting moderation.' );
} else {
$moderation_note = __( 'Your comment is awaiting moderation. This is a preview; your comment will be visible after it has been approved.' );
}
?> ?>
<<?php echo $tag; ?> <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?> id="comment-<?php comment_ID(); ?>"> <<?php echo $tag; ?> <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?> id="comment-<?php comment_ID(); ?>">
<?php if ( 'div' !== $args['style'] ) : ?> <?php if ( 'div' !== $args['style'] ) : ?>
@ -416,14 +328,10 @@ class Walker_Comment extends Walker {
); );
?> ?>
</div> </div>
<?php if ( '0' == $comment->comment_approved ) : ?>
<?php <em class="comment-awaiting-moderation"><?php echo $moderation_note; ?></em>
// Output the comment moderation feedback if needed. <br />
$this->awaiting_moderation_text( $comment ); <?php endif; ?>
// Output the comment approval notification opt-in form if needed.
echo $this->comment_approval_notification_form( $comment );
?>
<div class="comment-meta commentmetadata"> <div class="comment-meta commentmetadata">
<?php <?php
@ -493,6 +401,12 @@ class Walker_Comment extends Walker {
$commenter = wp_get_current_commenter(); $commenter = wp_get_current_commenter();
$show_pending_links = ! empty( $commenter['comment_author'] ); $show_pending_links = ! empty( $commenter['comment_author'] );
if ( $commenter['comment_author_email'] ) {
$moderation_note = __( 'Your comment is awaiting moderation.' );
} else {
$moderation_note = __( 'Your comment is awaiting moderation. This is a preview; your comment will be visible after it has been approved.' );
}
?> ?>
<<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?>> <<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?>>
<article id="div-comment-<?php comment_ID(); ?>" class="comment-body"> <article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
@ -536,13 +450,9 @@ class Walker_Comment extends Walker {
?> ?>
</div><!-- .comment-metadata --> </div><!-- .comment-metadata -->
<?php <?php if ( '0' == $comment->comment_approved ) : ?>
// Output the comment moderation feedback if needed. <em class="comment-awaiting-moderation"><?php echo $moderation_note; ?></em>
$this->awaiting_moderation_text( $comment ); <?php endif; ?>
// Output the comment approval notification opt-in form if needed.
echo $this->comment_approval_notification_form( $comment );
?>
</footer><!-- .comment-meta --> </footer><!-- .comment-meta -->
<div class="comment-content"> <div class="comment-content">

108
wp-includes/comment.php
View File

@ -2350,114 +2350,6 @@ function wp_new_comment_notify_postauthor( $comment_ID ) {
return wp_notify_postauthor( $comment_ID ); return wp_notify_postauthor( $comment_ID );
} }
/**
* Notifies the comment author when their comment gets approved.
*
* This notification is only sent once when the comment status
* changes from unapproved to approved.
*
* @since 5.7.0
*
* @param int|WP_Comment $comment_id Comment ID or WP_Comment object.
* @return bool Whether the email was sent.
*/
function wp_new_comment_notify_comment_author( $comment_id ) {
$comment = get_comment( $comment_id );
if ( ! $comment ) {
return false;
}
$post = get_post( $comment->comment_post_ID );
if ( ! $post ) {
return false;
}
// Make sure the comment author can be notified by email.
if ( empty( $comment->comment_author_email ) ) {
return false;
}
if ( ! get_comment_meta( $comment->comment_ID, '_wp_comment_author_notification_optin', true ) ) {
return false;
}
/**
* The blogname option is escaped with esc_html when
* saved into the database, we need to reverse this for
* the plain text area of the email.
*/
$blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
$subject = sprintf(
/* translators: 1: Blog name, 2: Post title. */
__( '[%1$s] Your comment on "%2$s" has been approved' ),
$blogname,
$post->post_title
);
if ( ! empty( $comment->comment_author ) ) {
$notify_message = sprintf(
/* translators: %s: Comment author's name. */
__( 'Howdy %s,' ),
$comment->comment_author
) . "\r\n\r\n";
} else {
$notify_message = __( 'Howdy,' ) . "\r\n\r\n";
}
$notify_message .= sprintf(
/* translators: %s: Post title. */
__( 'Your comment on "%s" has been approved.' ),
$post->post_title
) . "\r\n\r\n";
$notify_message .= sprintf(
/* translators: %s: Comment permalink. */
__( 'View comment: %s' ),
get_comment_link( $comment )
) . "\r\n";
$email = array(
'to' => $comment->comment_author_email,
'subject' => $subject,
'message' => $notify_message,
'headers' => '',
);
/**
* Filters the contents of the email sent to notify a comment author that their comment was approved.
*
* Content should be formatted for transmission via wp_mail().
*
* @since 5.7.0
*
* @param array $email {
* Used to build wp_mail().
*
* @type string $to The email address of the comment author.
* @type string $subject The subject of the email.
* @type string $message The content of the email.
* @type string $headers Headers.
* }
* @param WP_Comment $comment Comment object.
*/
$email = apply_filters( 'comment_approval_notification', $email, $comment );
$sent = wp_mail(
$email['to'],
wp_specialchars_decode( $email['subject'] ),
$email['message'],
$email['headers']
);
// Delete the opt-in now the notification has been sent.
delete_comment_meta( $comment->comment_ID, '_wp_comment_author_notification_optin' );
return $sent;
}
/** /**
* Sets the status of a comment. * Sets the status of a comment.
* *

1
wp-includes/default-filters.php
View File

@ -478,7 +478,6 @@ add_action( 'comment_post', 'wp_new_comment_notify_postauthor' );
add_action( 'after_password_reset', 'wp_password_change_notification' ); add_action( 'after_password_reset', 'wp_password_change_notification' );
add_action( 'register_new_user', 'wp_send_new_user_notifications' ); add_action( 'register_new_user', 'wp_send_new_user_notifications' );
add_action( 'edit_user_created_user', 'wp_send_new_user_notifications', 10, 2 ); add_action( 'edit_user_created_user', 'wp_send_new_user_notifications', 10, 2 );
add_action( 'comment_unapproved_to_approved', 'wp_new_comment_notify_comment_author' );
// REST API actions. // REST API actions.
add_action( 'init', 'rest_api_init' ); add_action( 'init', 'rest_api_init' );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.7-beta3-50374'; $wp_version = '5.7-beta3-50375';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.