Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-24 21:32:51 +02:00
Code Issues Projects Releases Wiki Activity

Comments: Rename Walker_Comment::comment_text() to ::filter_comment_text() for clarity.

Browse Source 
Ensure the comment object is not null before checking its status.

Follow-up to [47887].

See #49956.
Built from https://develop.svn.wordpress.org/trunk@47889


git-svn-id: http://core.svn.wordpress.org/trunk@47663 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-06-02 21:45:10 +00:00
parent 9f86174e08
commit 569c006248
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,7 +182,7 @@ class Walker_Comment extends Walker {
} }
if ( 'comment' === $comment->comment_type ) { if ( 'comment' === $comment->comment_type ) {
add_filter( 'comment_text', array( $this, 'comment_text' ), 40, 2 ); add_filter( 'comment_text', array( $this, 'filter_comment_text' ), 40, 2 );
} }
if ( ( 'pingback' === $comment->comment_type || 'trackback' === $comment->comment_type ) && $args['short_ping'] ) { if ( ( 'pingback' === $comment->comment_type || 'trackback' === $comment->comment_type ) && $args['short_ping'] ) {
@ -200,7 +200,7 @@ class Walker_Comment extends Walker {
} }
if ( 'comment' === $comment->comment_type ) { if ( 'comment' === $comment->comment_type ) {
remove_filter( 'comment_text', array( $this, 'comment_text' ), 40, 2 ); remove_filter( 'comment_text', array( $this, 'filter_comment_text' ), 40, 2 );
} }
} }
@ -253,20 +253,23 @@ class Walker_Comment extends Walker {
} }
/** /**
* Remove links from the pending comment's text if the commenter has not consent to the comment cookie. * Filters the comment text.
*
* Removes links from the pending comment's text if the commenter did not consent
* to the comment cookies.
* *
* @since 5.4.2 * @since 5.4.2
* *
* @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. * @param WP_Comment|null $comment The comment object. Null if not found.
* @return string Text of the current comment. * @return string Filtered text of the current comment.
*/ */
function comment_text( $comment_text, $comment ) { public function filter_comment_text( $comment_text, $comment ) {
$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 ( '0' == $comment->comment_approved && ! $show_pending_links ) { if ( $comment && '0' == $comment->comment_approved && ! $show_pending_links ) {
return wp_kses( $comment_text, array() ); $comment_text = wp_kses( $comment_text, array() );
} }
return $comment_text; return $comment_text;
@ -294,12 +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'] ) { if ( $commenter['comment_author_email'] ) {
$moderation_note = __( 'Your comment is awaiting moderation.' ); $moderation_note = __( 'Your comment is awaiting moderation.' );
} else { } else {
$moderation_note = __( 'Your comment is awaiting moderation. This is a preview, your comment will be visible after it has been approved.' ); $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'] ) : ?>
@ -313,9 +316,11 @@ class Walker_Comment extends Walker {
?> ?>
<?php <?php
$comment_author = get_comment_author_link( $comment ); $comment_author = get_comment_author_link( $comment );
if ( '0' == $comment->comment_approved && ! $show_pending_links ) { if ( '0' == $comment->comment_approved && ! $show_pending_links ) {
$comment_author = get_comment_author( $comment ); $comment_author = get_comment_author( $comment );
} }
printf( printf(
/* translators: %s: Comment author link. */ /* translators: %s: Comment author link. */
__( '%s <span class="says">says:</span>' ), __( '%s <span class="says">says:</span>' ),
@ -390,12 +395,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'] ) { if ( $commenter['comment_author_email'] ) {
$moderation_note = __( 'Your comment is awaiting moderation.' ); $moderation_note = __( 'Your comment is awaiting moderation.' );
} else { } else {
$moderation_note = __( 'Your comment is awaiting moderation. This is a preview, your comment will be visible after it has been approved.' ); $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">
@ -408,9 +413,11 @@ class Walker_Comment extends Walker {
?> ?>
<?php <?php
$comment_author = get_comment_author_link( $comment ); $comment_author = get_comment_author_link( $comment );
if ( '0' == $comment->comment_approved && ! $show_pending_links ) { if ( '0' == $comment->comment_approved && ! $show_pending_links ) {
$comment_author = get_comment_author( $comment ); $comment_author = get_comment_author( $comment );
} }
printf( printf(
/* translators: %s: Comment author link. */ /* translators: %s: Comment author link. */
__( '%s <span class="says">says:</span>' ), __( '%s <span class="says">says:</span>' ),

2
wp-includes/comment-template.php
View File

@ -1018,7 +1018,7 @@ function comment_text( $comment_ID = 0, $args = array() ) {
* @see Walker_Comment::comment() * @see Walker_Comment::comment()
* *
* @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. * @param WP_Comment|null $comment The comment object. Null if not found.
* @param array $args An array of arguments. * @param array $args An array of arguments.
*/ */
echo apply_filters( 'comment_text', $comment_text, $comment, $args ); echo apply_filters( 'comment_text', $comment_text, $comment, $args );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.5-alpha-47887'; $wp_version = '5.5-alpha-47889';
/** /**
* 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.