Changeset 58335

Timestamp:

06/04/2024 03:27:57 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Comments: Ensure the correct comment ID type is passed to get_comment_author.

The $comment_id parameter of the get_comment_author filter is documented as a numeric string, however in case a non-existing comment ID is passed to the get_comment_author() function, it could be an integer instead.

This commit resolves the issue and adds a PHPUnit test demonstrating the behavior.

Includes updating get_comment_author_url() unit tests for consistency.

Follow-up to [41127], [52818].

Props david.binda.
Fixes #60475.

Location:

trunk

Files:

• src/wp-includes/comment-template.php (modified) (1 diff)
• tests/phpunit/tests/comment/getCommentAuthor.php (added)
• tests/phpunit/tests/comment/getCommentAuthorEmailLink.php (modified) (1 diff)
• tests/phpunit/tests/comment/getCommentAuthorUrl.php (modified) (2 diffs)
• tests/phpunit/tests/comment/getCommentAuthorUrlLink.php (modified) (1 diff)

trunk/src/wp-includes/comment-template.php

@@ -25 +25 @@
         $comment = get_comment( $comment_id );
 
-        $comment_id = ! empty( $comment->comment_ID ) ? $comment->comment_ID : $comment_id;
+        $comment_id = ! empty( $comment->comment_ID ) ? $comment->comment_ID : (string) $comment_id;
 
         if ( empty( $comment->comment_author ) ) {

trunk/tests/phpunit/tests/comment/getCommentAuthorEmailLink.php

@@ -6 +6 @@
  */
 class Tests_Comment_GetCommentAuthorEmailLink extends WP_UnitTestCase {
+
         public static $comment;
 

trunk/tests/phpunit/tests/comment/getCommentAuthorUrl.php

@@ -7 +7 @@
  */
 class Tests_Comment_GetCommentAuthorUrl extends WP_UnitTestCase {
-        public function get_comment_author_url_filter( $url, $id, $comment ) {
-                $this->assertSame( $id, $comment->comment_ID );
 
-                return $url;
+        private static $comment;
+
+        public static function set_up_before_class() {
+                parent::set_up_before_class();
+
+                self::$comment = self::factory()->comment->create_and_get(
+                        array(
+                                'comment_post_ID' => 0,
+                        )
+                );
+        }
+
+        public function get_comment_author_url_filter( $comment_author_url, $comment_id, $comment ) {
+                $this->assertSame( $comment_id, $comment->comment_ID );
+
+                return $comment_author_url;
         }
 
@@ -17 +30 @@
          */
         public function test_comment_author_url_passes_correct_comment_id() {
-                $comment = self::factory()->comment->create_and_get(
-                        array(
-                                'comment_post_ID' => 0,
-                        )
-                );
-
                 add_filter( 'get_comment_author_url', array( $this, 'get_comment_author_url_filter' ), 99, 3 );
 
-                get_comment_author_url( $comment );
-
-                remove_filter( 'get_comment_author_url', array( $this, 'get_comment_author_url_filter' ), 99 );
+                get_comment_author_url( self::$comment );
         }
 }

trunk/tests/phpunit/tests/comment/getCommentAuthorUrlLink.php

@@ -7 +7 @@
  */
 class Tests_Comment_GetCommentAuthorUrlLink extends WP_UnitTestCase {
+
         protected static $comments = array();