diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index fed6568af3..ccc57ed8ee 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -29,7 +29,7 @@ function get_comment_author( $comment_id = 0 ) {
 	} elseif ( is_scalar( $comment_id ) ) {
 		$comment_id = (string) $comment_id;
 	} else {
-		$comment_id = '';
+		$comment_id = '0';
 	}
 
 	if ( empty( $comment->comment_author ) ) {
@@ -233,7 +233,13 @@ function get_comment_author_email_link( $link_text = '', $before = '', $after =
 function get_comment_author_link( $comment_id = 0 ) {
 	$comment = get_comment( $comment_id );
 
-	$comment_id = ! empty( $comment->comment_ID ) ? $comment->comment_ID : (string) $comment_id;
+	if ( ! empty( $comment->comment_ID ) ) {
+		$comment_id = $comment->comment_ID;
+	} elseif ( is_scalar( $comment_id ) ) {
+		$comment_id = (string) $comment_id;
+	} else {
+		$comment_id = '0';
+	}
 
 	$comment_author_url = get_comment_author_url( $comment );
 	$comment_author     = get_comment_author( $comment );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index dbea95c968..a62d0ed8af 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.7-alpha-58807';
+$wp_version = '6.7-alpha-58809';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.