Changeset 47889 for trunk/src/wp-includes/class-walker-comment.php

Timestamp:

06/02/2020 08:51:34 PM (6 years ago)

Author:

SergeyBiryukov

Message:

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

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

Follow-up to [47887].

See #49956.

File:

• trunk/src/wp-includes/class-walker-comment.php (modified) (9 diffs)

trunk/src/wp-includes/class-walker-comment.php

@@ -183 +183 @@
 
                 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 );
                 }
 
@@ -201 +201 @@
 
                 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 );
                 }
         }
@@ -254 +254 @@
 
         /**
-         * 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
          *
          * @param string          $comment_text Text of the current comment.
-         * @param WP_Comment|null $comment      The comment object.
-         * @return string                       Text of the current comment.
-         */
-        function comment_text( $comment_text, $comment ) {
+         * @param WP_Comment|null $comment      The comment object. Null if not found.
+         * @return string Filtered text of the current comment.
+         */
+        public function filter_comment_text( $comment_text, $comment ) {
                 $commenter          = wp_get_current_commenter();
                 $show_pending_links = ! empty( $commenter['comment_author'] );
 
-                if ( '0' == $comment->comment_approved && ! $show_pending_links ) {
-                        return wp_kses( $comment_text, array() );
+                if ( $comment && '0' == $comment->comment_approved && ! $show_pending_links ) {
+                        $comment_text = wp_kses( $comment_text, array() );
                 }
 
@@ -295 +298 @@
                 $commenter          = wp_get_current_commenter();
                 $show_pending_links = isset( $commenter['comment_author'] ) && $commenter['comment_author'];
+
                 if ( $commenter['comment_author_email'] ) {
                         $moderation_note = __( 'Your comment is awaiting moderation.' );
@@ -300 +304 @@
                         $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(); ?>">
@@ -314 +317 @@
                         <?php
                         $comment_author = get_comment_author_link( $comment );
+
                         if ( '0' == $comment->comment_approved && ! $show_pending_links ) {
                                 $comment_author = get_comment_author( $comment );
                         }
+
                         printf(
                                 /* translators: %s: Comment author link. */
@@ -391 +396 @@
                 $commenter          = wp_get_current_commenter();
                 $show_pending_links = ! empty( $commenter['comment_author'] );
+
                 if ( $commenter['comment_author_email'] ) {
                         $moderation_note = __( 'Your comment is awaiting moderation.' );
@@ -396 +402 @@
                         $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 ); ?>>
@@ -409 +414 @@
                                                 <?php
                                                 $comment_author = get_comment_author_link( $comment );
+
                                                 if ( '0' == $comment->comment_approved && ! $show_pending_links ) {
                                                         $comment_author = get_comment_author( $comment );
                                                 }
+
                                                 printf(
                                                         /* translators: %s: Comment author link. */