From 8ba881647cb6ad2a218373af563b14e1aa94924f Mon Sep 17 00:00:00 2001 From: Rachel Baker Date: Sun, 14 May 2017 03:05:11 +0000 Subject: [PATCH] Comments: Update arguments passed to the 'comment_text' filter in `check_comment()`. Pass null or empty values for the missing $comment and $args parameters of the 'check_comment' filter in `check_comment()`. Props boonebgorges, vaishu.agola27, SergeyBiryukov. Fixes #38314. git-svn-id: https://develop.svn.wordpress.org/trunk@40664 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/comment-template.php | 6 +++--- src/wp-includes/comment.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/comment-template.php b/src/wp-includes/comment-template.php index e97229f5f6..e4815ec714 100644 --- a/src/wp-includes/comment-template.php +++ b/src/wp-includes/comment-template.php @@ -988,9 +988,9 @@ function comment_text( $comment_ID = 0, $args = array() ) { * * @see Walker_Comment::comment() * - * @param string $comment_text Text of the current comment. - * @param WP_Comment $comment The comment object. - * @param array $args An array of arguments. + * @param string $comment_text Text of the current comment. + * @param WP_Comment|null $comment The comment object. + * @param array $args An array of arguments. */ echo apply_filters( 'comment_text', $comment_text, $comment, $args ); } diff --git a/src/wp-includes/comment.php b/src/wp-includes/comment.php index 7398f99dd9..0fb9f01093 100644 --- a/src/wp-includes/comment.php +++ b/src/wp-includes/comment.php @@ -44,7 +44,7 @@ function check_comment($author, $email, $url, $comment, $user_ip, $user_agent, $ return false; /** This filter is documented in wp-includes/comment-template.php */ - $comment = apply_filters( 'comment_text', $comment ); + $comment = apply_filters( 'comment_text', $comment, null, array() ); // Check for the number of external links if a max allowed number is set. if ( $max_links = get_option( 'comment_max_links' ) ) {