<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[55660] trunk/src/wp-includes/comment-template.php: Coding Standards: Use more meaningful variable names in various comment functions.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/55660">55660</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/55660","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-04-19 14:38:34 +0000 (Wed, 19 Apr 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Use more meaningful variable names in various comment functions.
This aims to bring more consistency between the functions, as well as in filter parameters.
Includes minor code layout fixes for better readability.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/45667">[45667]</a>, <a href="https://core.trac.wordpress.org/changeset/47287">[47287]</a>, <a href="https://core.trac.wordpress.org/changeset/48579">[48579]</a>, <a href="https://core.trac.wordpress.org/changeset/53719">[53719]</a>, <a href="https://core.trac.wordpress.org/changeset/53723">[53723]</a>, <a href="https://core.trac.wordpress.org/changeset/55308">[55308]</a>.
See <a href="https://core.trac.wordpress.org/ticket/57839">#57839</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescommenttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment-template.php 2023-04-19 09:25:32 UTC (rev 55659)
+++ trunk/src/wp-includes/comment-template.php 2023-04-19 14:38:34 UTC (rev 55660)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,18 +22,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The comment author
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_comment_author( $comment_id = 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment = get_comment( $comment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment = get_comment( $comment_id );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_id = ! empty( $comment->comment_ID ) ? $comment->comment_ID : $comment_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $comment->comment_author ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user = ! empty( $comment->user_id ) ? get_userdata( $comment->user_id ) : false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author = $user->display_name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_author = $user->display_name;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author = __( 'Anonymous' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_author = __( 'Anonymous' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author = $comment->comment_author;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_author = $comment->comment_author;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,11 +43,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0 The `$comment_id` and `$comment` parameters were added.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $author The comment author's username.
- * @param string $comment_id The comment ID as a numeric string.
- * @param WP_Comment $comment The comment object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $comment_author The comment author's username.
+ * @param string $comment_id The comment ID as a numeric string.
+ * @param WP_Comment $comment The comment object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'get_comment_author', $author, $comment_id, $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'get_comment_author', $comment_author, $comment_id, $comment );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,8 +61,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function comment_author( $comment_id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment( $comment_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author = get_comment_author( $comment );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_author = get_comment_author( $comment );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the comment author's name for display.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,10 +70,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0 The `$comment_id` parameter was added.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $author The comment author's username.
- * @param string $comment_id The comment ID as a numeric string.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $comment_author The comment author's username.
+ * @param string $comment_id The comment ID as a numeric string.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo apply_filters( 'comment_author', $author, $comment->comment_ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo apply_filters( 'comment_author', $comment_author, $comment->comment_ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,9 +118,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Default current comment.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function comment_author_email( $comment_id = 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment = get_comment( $comment_id );
- $author_email = get_comment_author_email( $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment = get_comment( $comment_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_author_email = get_comment_author_email( $comment );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the comment author's email for display.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,10 +128,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0 The `$comment_id` parameter was added.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $author_email The comment author's email address.
- * @param string $comment_id The comment ID as a numeric string.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $comment_author_email The comment author's email address.
+ * @param string $comment_id The comment ID as a numeric string.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo apply_filters( 'author_email', $author_email, $comment->comment_ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo apply_filters( 'author_email', $comment_author_email, $comment->comment_ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,14 +146,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0 Added the `$comment` parameter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $linktext Optional. Text to display instead of the comment author's email address.
- * Default empty.
- * @param string $before Optional. Text or HTML to display before the email link. Default empty.
- * @param string $after Optional. Text or HTML to display after the email link. Default empty.
- * @param int|WP_Comment $comment Optional. Comment ID or WP_Comment object. Default is the current comment.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $link_text Optional. Text to display instead of the comment author's email address.
+ * Default empty.
+ * @param string $before Optional. Text or HTML to display before the email link. Default empty.
+ * @param string $after Optional. Text or HTML to display after the email link. Default empty.
+ * @param int|WP_Comment $comment Optional. Comment ID or WP_Comment object. Default is the current comment.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function comment_author_email_link( $linktext = '', $before = '', $after = '', $comment = null ) {
- $link = get_comment_author_email_link( $linktext, $before, $after, $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function comment_author_email_link( $link_text = '', $before = '', $after = '', $comment = null ) {
+ $link = get_comment_author_email_link( $link_text, $before, $after, $comment );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $link ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo $link;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,15 +171,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0 Added the `$comment` parameter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $linktext Optional. Text to display instead of the comment author's email address.
- * Default empty.
- * @param string $before Optional. Text or HTML to display before the email link. Default empty.
- * @param string $after Optional. Text or HTML to display after the email link. Default empty.
- * @param int|WP_Comment $comment Optional. Comment ID or WP_Comment object. Default is the current comment.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $link_text Optional. Text to display instead of the comment author's email address.
+ * Default empty.
+ * @param string $before Optional. Text or HTML to display before the email link. Default empty.
+ * @param string $after Optional. Text or HTML to display after the email link. Default empty.
+ * @param int|WP_Comment $comment Optional. Comment ID or WP_Comment object. Default is the current comment.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string HTML markup for the comment author email link. By default, the email address is obfuscated
</span><span class="cx" style="display: block; padding: 0 10px"> * via the {@see 'comment_email'} filter with antispambot().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_comment_author_email_link( $linktext = '', $before = '', $after = '', $comment = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_comment_author_email_link( $link_text = '', $before = '', $after = '', $comment = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment( $comment );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,14 +194,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $comment_author_email The comment author's email address.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Comment $comment The comment object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $email = apply_filters( 'comment_email', $comment->comment_author_email, $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_author_email = apply_filters( 'comment_email', $comment->comment_author_email, $comment );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( ! empty( $email ) ) && ( '@' !== $email ) ) {
- $display = ( '' !== $linktext ) ? $linktext : $email;
- $return = $before;
- $return .= sprintf( '<a href="%1$s">%2$s</a>', esc_url( 'mailto:' . $email ), esc_html( $display ) );
- $return .= $after;
- return $return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( ! empty( $comment_author_email ) ) && ( '@' !== $comment_author_email ) ) {
+ $display = ( '' !== $link_text ) ? $link_text : $comment_author_email;
+
+ $comment_author_email_link = $before . sprintf(
+ '<a href="%1$s">%2$s</a>',
+ esc_url( 'mailto:' . $comment_author_email ),
+ esc_html( $display )
+ ) . $after;
+
+ return $comment_author_email_link;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,16 +225,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The comment author name or HTML link for author's URL.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_comment_author_link( $comment_id = 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment = get_comment( $comment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment = get_comment( $comment_id );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_id = ! empty( $comment->comment_ID ) ? $comment->comment_ID : (string) $comment_id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = get_comment_author_url( $comment );
- $author = get_comment_author( $comment );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $url ) || 'http://' === $url ) {
- $return = $author;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_author_url = get_comment_author_url( $comment );
+ $comment_author = get_comment_author( $comment );
+
+ if ( empty( $comment_author_url ) || 'http://' === $comment_author_url ) {
+ $comment_author_link = $comment_author;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $rel_parts = array( 'ugc' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! wp_is_internal_link( $url ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_is_internal_link( $comment_author_url ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $rel_parts = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> $rel_parts,
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'external', 'nofollow' )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,11 +259,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Empty space before 'rel' is necessary for later sprintf().
</span><span class="cx" style="display: block; padding: 0 10px"> $rel = ! empty( $rel ) ? sprintf( ' rel="%s"', $rel ) : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $return = sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_author_link = sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> '<a href="%1$s" class="url"%2$s>%3$s</a>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_author_url,
</ins><span class="cx" style="display: block; padding: 0 10px"> $rel,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_author
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,14 +271,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the comment author's link for display.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.1.0 The `$author` and `$comment_id` parameters were added.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.1.0 The `$comment_author` and `$comment_id` parameters were added.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $return The HTML-formatted comment author link.
- * Empty for an invalid URL.
- * @param string $author The comment author's username.
- * @param string $comment_id The comment ID as a numeric string.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $comment_author_link The HTML-formatted comment author link.
+ * Empty for an invalid URL.
+ * @param string $comment_author The comment author's username.
+ * @param string $comment_id The comment ID as a numeric string.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'get_comment_author_link', $return, $author, $comment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'get_comment_author_link', $comment_author_link, $comment_author, $comment_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,13 +345,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_comment_author_url( $comment_id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment( $comment_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = '';
- $id = 0;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_author_url = '';
+ $comment_id = 0;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $comment ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_url = ( 'http://' === $comment->comment_author_url ) ? '' : $comment->comment_author_url;
- $url = esc_url( $author_url, array( 'http', 'https' ) );
- $id = $comment->comment_ID;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_author_url = ( 'http://' === $comment->comment_author_url ) ? '' : $comment->comment_author_url;
+ $comment_author_url = esc_url( $comment_author_url, array( 'http', 'https' ) );
+
+ $comment_id = $comment->comment_ID;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,11 +362,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0 The `$comment_id` and `$comment` parameters were added.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $url The comment author's URL, or an empty string.
- * @param string|int $comment_id The comment ID as a numeric string, or 0 if not found.
- * @param WP_Comment|null $comment The comment object, or null if not found.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $comment_author_url The comment author's URL, or an empty string.
+ * @param string|int $comment_id The comment ID as a numeric string, or 0 if not found.
+ * @param WP_Comment|null $comment The comment object, or null if not found.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'get_comment_author_url', $url, $id, $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'get_comment_author_url', $comment_author_url, $comment_id, $comment );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,9 +379,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Default current comment.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function comment_author_url( $comment_id = 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment = get_comment( $comment_id );
- $author_url = get_comment_author_url( $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment = get_comment( $comment_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_author_url = get_comment_author_url( $comment );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the comment author's URL for display.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -377,17 +389,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0 The `$comment_id` parameter was added.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $author_url The comment author's URL.
- * @param string $comment_id The comment ID as a numeric string.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $comment_author_url The comment author's URL.
+ * @param string $comment_id The comment ID as a numeric string.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo apply_filters( 'comment_url', $author_url, $comment->comment_ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo apply_filters( 'comment_url', $comment_author_url, $comment->comment_ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Retrieves the HTML link of the URL of the author of the current comment.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * $linktext parameter is only used if the URL does not exist for the comment
- * author. If the URL does exist then the URL will be used and the $linktext
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * $link_text parameter is only used if the URL does not exist for the comment
+ * author. If the URL does exist then the URL will be used and the $link_text
</ins><span class="cx" style="display: block; padding: 0 10px"> * will be ignored.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Encapsulate the HTML link between the $before and $after. So it will appear
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,19 +408,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0 Added the `$comment` parameter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $linktext Optional. The text to display instead of the comment
- * author's email address. Default empty.
- * @param string $before Optional. The text or HTML to display before the email link.
- * Default empty.
- * @param string $after Optional. The text or HTML to display after the email link.
- * Default empty.
- * @param int|WP_Comment $comment Optional. Comment ID or WP_Comment object.
- * Default is the current comment.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $link_text Optional. The text to display instead of the comment
+ * author's email address. Default empty.
+ * @param string $before Optional. The text or HTML to display before the email link.
+ * Default empty.
+ * @param string $after Optional. The text or HTML to display after the email link.
+ * Default empty.
+ * @param int|WP_Comment $comment Optional. Comment ID or WP_Comment object.
+ * Default is the current comment.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The HTML link between the $before and $after parameters.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
- $url = get_comment_author_url( $comment );
- $display = ( '' !== $linktext ) ? $linktext : $url;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_comment_author_url_link( $link_text = '', $before = '', $after = '', $comment = 0 ) {
+ $comment_author_url = get_comment_author_url( $comment );
+
+ $display = ( '' !== $link_text ) ? $link_text : $comment_author_url;
</ins><span class="cx" style="display: block; padding: 0 10px"> $display = str_replace( 'http://www.', '', $display );
</span><span class="cx" style="display: block; padding: 0 10px"> $display = str_replace( 'http://', '', $display );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -416,7 +429,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $display = substr( $display, 0, -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $return = "$before<a href='$url' rel='external'>$display</a>$after";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_author_url_link = $before . sprintf(
+ '<a href="%1$s" rel="external">%2$s</a>',
+ $comment_author_url,
+ $display
+ ) . $after;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the comment author's returned URL link.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -423,9 +440,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $return The HTML-formatted comment author URL link.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $comment_author_url_link The HTML-formatted comment author URL link.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'get_comment_author_url_link', $return );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'get_comment_author_url_link', $comment_author_url_link );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -434,17 +451,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0 Added the `$comment` parameter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $linktext Optional. Text to display instead of the comment author's
- * email address. Default empty.
- * @param string $before Optional. Text or HTML to display before the email link.
- * Default empty.
- * @param string $after Optional. Text or HTML to display after the email link.
- * Default empty.
- * @param int|WP_Comment $comment Optional. Comment ID or WP_Comment object.
- * Default is the current comment.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $link_text Optional. Text to display instead of the comment author's
+ * email address. Default empty.
+ * @param string $before Optional. Text or HTML to display before the email link.
+ * Default empty.
+ * @param string $after Optional. Text or HTML to display after the email link.
+ * Default empty.
+ * @param int|WP_Comment $comment Optional. Comment ID or WP_Comment object.
+ * Default is the current comment.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
- echo get_comment_author_url_link( $linktext, $before, $after, $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function comment_author_url_link( $link_text = '', $before = '', $after = '', $comment = 0 ) {
+ echo get_comment_author_url_link( $link_text, $before, $after, $comment );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -586,7 +603,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_format = ! empty( $format ) ? $format : get_option( 'date_format' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $date = mysql2date( $_format, $comment->comment_date );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_date = mysql2date( $_format, $comment->comment_date );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the returned comment date.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,11 +610,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string|int $date Formatted date string or Unix timestamp.
- * @param string $format PHP date format.
- * @param WP_Comment $comment The comment object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string|int $comment_date Formatted date string or Unix timestamp.
+ * @param string $format PHP date format.
+ * @param WP_Comment $comment The comment object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'get_comment_date', $date, $format, $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'get_comment_date', $comment_date, $format, $comment );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -647,7 +664,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_excerpt_length = apply_filters( 'comment_excerpt_length', $comment_excerpt_length );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $excerpt = wp_trim_words( $comment_text, $comment_excerpt_length, '…' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_excerpt = wp_trim_words( $comment_text, $comment_excerpt_length, '…' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the retrieved comment excerpt.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -655,11 +672,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0 The `$comment_id` and `$comment` parameters were added.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $excerpt The comment excerpt text.
- * @param string $comment_id The comment ID as a numeric string.
- * @param WP_Comment $comment The comment object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $comment_excerpt The comment excerpt text.
+ * @param string $comment_id The comment ID as a numeric string.
+ * @param WP_Comment $comment The comment object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'get_comment_excerpt', $excerpt, $comment->comment_ID, $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'get_comment_excerpt', $comment_excerpt, $comment->comment_ID, $comment );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -672,7 +689,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Default current comment.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function comment_excerpt( $comment_id = 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment = get_comment( $comment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment = get_comment( $comment_id );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_excerpt = get_comment_excerpt( $comment );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -695,7 +713,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The comment ID as a numeric string.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_comment_ID() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment = get_comment();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment = get_comment();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_id = ! empty( $comment->comment_ID ) ? $comment->comment_ID : '0';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -761,10 +780,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'max_depth' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'cpage' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args = wp_parse_args( $args, $defaults );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = get_permalink( $comment->comment_post_ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = wp_parse_args( $args, $defaults );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_link = get_permalink( $comment->comment_post_ID );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // The 'cpage' param takes precedence.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $args['cpage'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cpage = $args['cpage'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -803,20 +823,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $cpage && get_option( 'page_comments' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_rewrite->using_permalinks() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $cpage ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = trailingslashit( $link ) . $wp_rewrite->comments_pagination_base . '-' . $cpage;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_link = trailingslashit( $comment_link ) . $wp_rewrite->comments_pagination_base . '-' . $cpage;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = user_trailingslashit( $link, 'comment' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_link = user_trailingslashit( $comment_link, 'comment' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $cpage ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = add_query_arg( 'cpage', $cpage, $link );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_link = add_query_arg( 'cpage', $cpage, $comment_link );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_rewrite->using_permalinks() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = user_trailingslashit( $link, 'comment' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_link = user_trailingslashit( $comment_link, 'comment' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = $link . '#comment-' . $comment->comment_ID;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_link = $comment_link . '#comment-' . $comment->comment_ID;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the returned single comment permalink.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -826,12 +846,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see get_page_of_comment()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $link The comment permalink with '#comment-$id' appended.
- * @param WP_Comment $comment The current comment object.
- * @param array $args An array of arguments to override the defaults.
- * @param int $cpage The calculated 'cpage' value.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $comment_link The comment permalink with '#comment-$id' appended.
+ * @param WP_Comment $comment The current comment object.
+ * @param array $args An array of arguments to override the defaults.
+ * @param int $cpage The calculated 'cpage' value.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'get_comment_link', $link, $comment, $args, $cpage );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'get_comment_link', $comment_link, $comment, $args, $cpage );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -887,8 +907,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_comments_number( $post = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $count = $post ? $post->comment_count : 0;
- $post_id = $post ? $post->ID : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments_number = $post ? $post->comment_count : 0;
+ $post_id = $post ? $post->ID : 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the returned comment count for a post.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -895,10 +915,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string|int $count A string representing the number of comments a post has, otherwise 0.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string|int $comments_number A string representing the number of comments a post has, otherwise 0.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_id Post ID.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'get_comments_number', $count, $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'get_comments_number', $comments_number, $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -929,12 +949,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Language string for the number of comments a post has.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_comments_number_text( $zero = false, $one = false, $more = false, $post = 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $number = get_comments_number( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments_number = get_comments_number( $post );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $number > 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $comments_number > 1 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === $more ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Number of comments. */
- $output = sprintf( _n( '%s Comment', '%s Comments', $number ), number_format_i18n( $number ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments_number_text = sprintf(
+ /* translators: %s: Number of comments. */
+ _n( '%s Comment', '%s Comments', $comments_number ),
+ number_format_i18n( $comments_number )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // % Comments
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -949,7 +972,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace '% Comments' with a proper plural form.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $text && ! preg_match( '/[0-9]+/', $text ) && false !== strpos( $more, '%' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of comments. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new_text = _n( '%s Comment', '%s Comments', $number );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_text = _n( '%s Comment', '%s Comments', $comments_number );
</ins><span class="cx" style="display: block; padding: 0 10px"> $new_text = trim( sprintf( $new_text, '' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $more = str_replace( $text, $new_text, $more );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -959,13 +982,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output = str_replace( '%', number_format_i18n( $number ), $more );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments_number_text = str_replace( '%', number_format_i18n( $comments_number ), $more );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 0 == $number ) {
- $output = ( false === $zero ) ? __( 'No Comments' ) : $zero;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 0 == $comments_number ) {
+ $comments_number_text = ( false === $zero ) ? __( 'No Comments' ) : $zero;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else { // Must be one.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output = ( false === $one ) ? __( '1 Comment' ) : $one;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments_number_text = ( false === $one ) ? __( '1 Comment' ) : $one;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the comments count for display.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -973,11 +997,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see _n()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $output A translatable string formatted based on whether the count
- * is equal to 0, 1, or 1+.
- * @param int $number The number of post comments.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $comments_number_text A translatable string formatted based on whether the count
+ * is equal to 0, 1, or 1+.
+ * @param int $comments_number The number of post comments.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'comments_number', $output, $number );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'comments_number', $comments_number_text, $comments_number );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -997,7 +1021,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_comment_text( $comment_id = 0, $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment( $comment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_content = $comment->comment_content;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_text = $comment->comment_content;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_comment_feed() && $comment->comment_parent ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = get_comment( $comment->comment_parent );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1005,11 +1029,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_link = esc_url( get_comment_link( $parent ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $name = get_comment_author( $parent );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_content = sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_text = sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Comment link. */
</span><span class="cx" style="display: block; padding: 0 10px"> ent2ncr( __( 'In reply to %s.' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="' . $parent_link . '">' . $name . '</a>'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) . "\n\n" . $comment_content;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) . "\n\n" . $comment_text;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1020,11 +1044,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Walker_Comment::comment()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $comment_content Text of the comment.
- * @param WP_Comment $comment The comment object.
- * @param array $args An array of arguments.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $comment_text Text of the comment.
+ * @param WP_Comment $comment The comment object.
+ * @param array $args An array of arguments.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'get_comment_text', $comment_content, $comment, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'get_comment_text', $comment_text, $comment, $args );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1043,6 +1067,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment( $comment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_text = get_comment_text( $comment, $args );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the text of a comment to be displayed.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1050,7 +1075,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Walker_Comment::comment()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $comment_text Text of the current comment.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $comment_text Text of the comment.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Comment|null $comment The comment object. Null if not found.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args An array of arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1082,7 +1107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_format = ! empty( $format ) ? $format : get_option( 'time_format' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $date = mysql2date( $_format, $comment_date, $translate );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_time = mysql2date( $_format, $comment_date, $translate );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the returned comment time.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1089,13 +1114,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string|int $date The comment time, formatted as a date string or Unix timestamp.
- * @param string $format PHP date format.
- * @param bool $gmt Whether the GMT date is in use.
- * @param bool $translate Whether the time is translated.
- * @param WP_Comment $comment The comment object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string|int $comment_time The comment time, formatted as a date string or Unix timestamp.
+ * @param string $format PHP date format.
+ * @param bool $gmt Whether the GMT date is in use.
+ * @param bool $translate Whether the time is translated.
+ * @param WP_Comment $comment The comment object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'get_comment_time', $date, $format, $gmt, $translate, $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'get_comment_time', $comment_time, $format, $gmt, $translate, $comment );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1278,8 +1303,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function comments_open( $post = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_post = get_post( $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $_post ? $_post->ID : 0;
- $open = ( $_post && ( 'open' === $_post->comment_status ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = $_post ? $_post->ID : 0;
+ $comments_open = ( $_post && ( 'open' === $_post->comment_status ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether the current post is open for comments.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1286,10 +1311,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $open Whether the current post is open for comments.
- * @param int $post_id The post ID.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $comments_open Whether the current post is open for comments.
+ * @param int $post_id The post ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'comments_open', $open, $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'comments_open', $comments_open, $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1307,8 +1332,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function pings_open( $post = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_post = get_post( $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $_post ? $_post->ID : 0;
- $open = ( $_post && ( 'open' === $_post->ping_status ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = $_post ? $_post->ID : 0;
+ $pings_open = ( $_post && ( 'open' === $_post->ping_status ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether the current post is open for pings.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1315,10 +1340,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $open Whether the current post is open for pings.
- * @param int $post_id The post ID.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $pings_open Whether the current post is open for pings.
+ * @param int $post_id The post ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'pings_open', $open, $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'pings_open', $pings_open, $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1608,9 +1633,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param false|string $none Optional. String to display when comments have been turned off. Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = get_the_ID();
- $post_title = get_the_title();
- $number = get_comments_number( $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = get_the_ID();
+ $post_title = get_the_title();
+ $comments_number = get_comments_number( $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $zero ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Post title. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1624,8 +1649,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $more ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Number of comments, 2: Post title. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $more = _n( '%1$s Comment<span class="screen-reader-text"> on %2$s</span>', '%1$s Comments<span class="screen-reader-text"> on %2$s</span>', $number );
- $more = sprintf( $more, number_format_i18n( $number ), $post_title );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $more = _n(
+ '%1$s Comment<span class="screen-reader-text"> on %2$s</span>',
+ '%1$s Comments<span class="screen-reader-text"> on %2$s</span>',
+ $comments_number
+ );
+ $more = sprintf( $more, number_format_i18n( $comments_number ), $post_title );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $none ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1633,8 +1662,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $none = sprintf( __( 'Comments Off<span class="screen-reader-text"> on %s</span>' ), $post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 == $number && ! comments_open() && ! pings_open() ) {
- echo '<span' . ( ( ! empty( $css_class ) ) ? ' class="' . esc_attr( $css_class ) . '"' : '' ) . '>' . $none . '</span>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 == $comments_number && ! comments_open() && ! pings_open() ) {
+ printf(
+ '<span%1$s>%2$s</span>',
+ ! empty( $css_class ) ? ' class="' . esc_attr( $css_class ) . '"' : '',
+ $none
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1643,8 +1676,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<a href="';
- if ( 0 == $number ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 == $comments_number ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $respond_link = get_permalink() . '#respond';
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the respond link when a post has no comments.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1654,29 +1686,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $respond_link The default response link.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_id The post ID.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo apply_filters( 'respond_link', $respond_link, $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments_link = apply_filters( 'respond_link', $respond_link, $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- comments_link();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments_link = get_comments_link();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '"';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $css_class ) ) {
- echo ' class="' . $css_class . '" ';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link_attributes = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attributes = '';
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the comments link attributes for display.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $attributes The comments link attributes. Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $link_attributes The comments link attributes. Default empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo apply_filters( 'comments_popup_link_attributes', $attributes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link_attributes = apply_filters( 'comments_popup_link_attributes', $link_attributes );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '>';
- comments_number( $zero, $one, $more );
- echo '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ '<a href="%1$s"%2$s%3$s>%4$s</a>',
+ esc_url( $comments_link ),
+ ! empty( $css_class ) ? ' class="' . $css_class . '" ' : '',
+ $link_attributes,
+ get_comments_number_text( $zero, $one, $more )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1802,17 +1834,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_reply_link = $args['before'] . $link . $args['after'];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the comment reply link.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $link The HTML markup for the comment reply link.
- * @param array $args An array of arguments overriding the defaults.
- * @param WP_Comment $comment The object of the comment being replied.
- * @param WP_Post $post The WP_Post object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $comment_reply_link The HTML markup for the comment reply link.
+ * @param array $args An array of arguments overriding the defaults.
+ * @param WP_Comment $comment The object of the comment being replied.
+ * @param WP_Post $post The WP_Post object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'comment_reply_link', $args['before'] . $link . $args['after'], $args, $comment, $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'comment_reply_link', $comment_reply_link, $args, $comment, $post );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1893,17 +1927,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['reply_text']
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $formatted_link = $args['before'] . $link . $args['after'];
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_reply_link = $args['before'] . $link . $args['after'];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the formatted post comments link HTML.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $formatted The HTML-formatted post comments link.
- * @param int|WP_Post $post The post ID or WP_Post object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $post_reply_link The HTML-formatted post comments link.
+ * @param int|WP_Post $post The post ID or WP_Post object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'post_comments_link', $formatted_link, $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'post_comments_link', $post_reply_link, $post );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1927,23 +1962,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.2.0 Added the `$post` parameter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $text Optional. Text to display for cancel reply link. If empty,
- * defaults to 'Click here to cancel reply'. Default empty.
- * @param int|WP_Post|null $post Optional. The post the comment thread is being
- * displayed for. Defaults to the current global post.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $link_text Optional. Text to display for cancel reply link. If empty,
+ * defaults to 'Click here to cancel reply'. Default empty.
+ * @param int|WP_Post|null $post Optional. The post the comment thread is being
+ * displayed for. Defaults to the current global post.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_cancel_comment_reply_link( $text = '', $post = null ) {
- if ( empty( $text ) ) {
- $text = __( 'Click here to cancel reply.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_cancel_comment_reply_link( $link_text = '', $post = null ) {
+ if ( empty( $link_text ) ) {
+ $link_text = __( 'Click here to cancel reply.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $reply_to_id = $post ? _get_comment_reply_id( $post->ID ) : 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $style = 0 !== $reply_to_id ? '' : ' style="display:none;"';
- $link = esc_url( remove_query_arg( array( 'replytocom', 'unapproved', 'moderation-hash' ) ) ) . '#respond';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link_style = 0 !== $reply_to_id ? '' : ' style="display:none;"';
+ $link_url = esc_url( remove_query_arg( array( 'replytocom', 'unapproved', 'moderation-hash' ) ) ) . '#respond';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $formatted_link = '<a rel="nofollow" id="cancel-comment-reply-link" href="' . $link . '"' . $style . '>' . $text . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cancel_comment_reply_link = sprintf(
+ '<a rel="nofollow" id="cancel-comment-reply-link" href="%1$s"%2$s>%3$s</a>',
+ $link_url,
+ $link_style,
+ $link_text
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the cancel comment reply link HTML.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1950,11 +1990,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $formatted_link The HTML-formatted cancel comment reply link.
- * @param string $link Cancel comment reply link URL.
- * @param string $text Cancel comment reply link text.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $cancel_comment_reply_link The HTML-formatted cancel comment reply link.
+ * @param string $link_url Cancel comment reply link URL.
+ * @param string $link_text Cancel comment reply link text.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'cancel_comment_reply_link', $formatted_link, $link, $text );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'cancel_comment_reply_link', $cancel_comment_reply_link, $link_url, $link_text );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1962,11 +2002,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $text Optional. Text to display for cancel reply link. If empty,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $link_text Optional. Text to display for cancel reply link. If empty,
</ins><span class="cx" style="display: block; padding: 0 10px"> * defaults to 'Click here to cancel reply'. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function cancel_comment_reply_link( $text = '' ) {
- echo get_cancel_comment_reply_link( $text );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function cancel_comment_reply_link( $link_text = '' ) {
+ echo get_cancel_comment_reply_link( $link_text );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1987,19 +2027,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $post->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> $reply_to_id = _get_comment_reply_id( $post_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = "<input type='hidden' name='comment_post_ID' value='$post_id' id='comment_post_ID' />\n";
- $result .= "<input type='hidden' name='comment_parent' id='comment_parent' value='$reply_to_id' />\n";
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_id_fields = "<input type='hidden' name='comment_post_ID' value='$post_id' id='comment_post_ID' />\n";
+ $comment_id_fields .= "<input type='hidden' name='comment_parent' id='comment_parent' value='$reply_to_id' />\n";
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the returned comment ID fields.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $result The HTML-formatted hidden ID field comment elements.
- * @param int $post_id The post ID.
- * @param int $reply_to_id The ID of the comment being replied to.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $comment_id_fields The HTML-formatted hidden ID field comment elements.
+ * @param int $post_id The post ID.
+ * @param int $reply_to_id The ID of the comment being replied to.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'comment_id_fields', $result, $post_id, $reply_to_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'comment_id_fields', $comment_id_fields, $post_id, $reply_to_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2074,12 +2115,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment( $reply_to_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $link_to_parent ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author = '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author( $reply_to_id ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_author = sprintf(
+ '<a href="#comment-%1$s">%2$s</a>',
+ get_comment_ID(),
+ get_comment_author( $reply_to_id )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author = get_comment_author( $reply_to_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_author = get_comment_author( $reply_to_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( $reply_text, $author );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( $reply_text, $comment_author );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>