From 7a965fcfe631ae03cfcea024cc795e58eae78ae0 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Mon, 24 Jul 2017 22:02:45 +0000
Subject: [PATCH] Comments: Ensure the correct comment ID is passed to the
 `get_comment_author_url` filter.

Props dominik.schwind

Fixes #41334


git-svn-id: https://develop.svn.wordpress.org/trunk@41127 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/comment-template.php          |  2 +-
 .../tests/comment/getCommentAuthorUrl.php     | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 tests/phpunit/tests/comment/getCommentAuthorUrl.php

diff --git a/src/wp-includes/comment-template.php b/src/wp-includes/comment-template.php
index fe17e2f043..3fd466f933 100644
--- a/src/wp-includes/comment-template.php
+++ b/src/wp-includes/comment-template.php
@@ -306,7 +306,7 @@ function get_comment_author_url( $comment_ID = 0 ) {
 	if ( ! empty( $comment ) ) {
 		$author_url = ( 'http://' == $comment->comment_author_url ) ? '' : $comment->comment_author_url;
 		$url = esc_url( $author_url, array( 'http', 'https' ) );
-		$id = $comment->ID;
+		$id = $comment->comment_ID;
 	}
 
 	/**
diff --git a/tests/phpunit/tests/comment/getCommentAuthorUrl.php b/tests/phpunit/tests/comment/getCommentAuthorUrl.php
new file mode 100644
index 0000000000..b2710628aa
--- /dev/null
+++ b/tests/phpunit/tests/comment/getCommentAuthorUrl.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * @group comment
+ */
+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;
+	}
+
+	/**
+	 * @ticket 41334
+	 */
+	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 );
+	}
+}