' . $none . '';
return;
}
@@ -1543,8 +1579,8 @@
}
echo '"';
- if ( !empty( $css_class ) ) {
- echo ' class="'.$css_class.'" ';
+ if ( ! empty( $css_class ) ) {
+ echo ' class="' . $css_class . '" ';
}
$attributes = '';
@@ -1595,13 +1631,13 @@
'add_below' => 'comment',
'respond_id' => 'respond',
'reply_text' => __( 'Reply' ),
- /* translators: Comment reply button text. 1: Comment author name */
+ /* translators: Comment reply button text. %s: Comment author name */
'reply_to_text' => __( 'Reply to %s' ),
'login_text' => __( 'Log in to Reply' ),
'max_depth' => 0,
'depth' => 0,
'before' => '',
- 'after' => ''
+ 'after' => '',
);
$args = wp_parse_args( $args, $defaults );
@@ -1635,18 +1671,39 @@
$args = apply_filters( 'comment_reply_link_args', $args, $comment, $post );
if ( get_option( 'comment_registration' ) && ! is_user_logged_in() ) {
- $link = sprintf( '',
+ $link = sprintf(
+ '',
esc_url( wp_login_url( get_permalink() ) ),
$args['login_text']
);
} else {
- $onclick = sprintf( 'return addComment.moveForm( "%1$s-%2$s", "%2$s", "%3$s", "%4$s" )',
- $args['add_below'], $comment->comment_ID, $args['respond_id'], $post->ID
+ $data_attributes = array(
+ 'commentid' => $comment->comment_ID,
+ 'postid' => $post->ID,
+ 'belowelement' => $args['add_below'] . '-' . $comment->comment_ID,
+ 'respondelement' => $args['respond_id'],
);
- $link = sprintf( "",
- esc_url( add_query_arg( 'replytocom', $comment->comment_ID, get_permalink( $post->ID ) ) ) . "#" . $args['respond_id'],
- $onclick,
+ $data_attribute_string = '';
+
+ foreach ( $data_attributes as $name => $value ) {
+ $data_attribute_string .= " data-${name}=\"" . esc_attr( $value ) . '"';
+ }
+
+ $data_attribute_string = trim( $data_attribute_string );
+
+ $link = sprintf(
+ "",
+ esc_url(
+ add_query_arg(
+ array(
+ 'replytocom' => $comment->comment_ID,
+ 'unapproved' => false,
+ 'moderation-hash' => false,
+ )
+ )
+ ) . '#' . $args['respond_id'],
+ $data_attribute_string,
esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ),
$args['reply_text']
);
@@ -1678,8 +1735,8 @@
* Default current post.
* @return mixed Link to show comment form, if successful. False, if comments are closed.
*/
-function comment_reply_link($args = array(), $comment = null, $post = null) {
- echo get_comment_reply_link($args, $comment, $post);
+function comment_reply_link( $args = array(), $comment = null, $post = null ) {
+ echo get_comment_reply_link( $args, $comment, $post );
}
/**
@@ -1705,35 +1762,40 @@
* Default current post.
* @return false|null|string Link to show comment form, if successful. False, if comments are closed.
*/
-function get_post_reply_link($args = array(), $post = null) {
+function get_post_reply_link( $args = array(), $post = null ) {
$defaults = array(
'add_below' => 'post',
'respond_id' => 'respond',
- 'reply_text' => __('Leave a Comment'),
- 'login_text' => __('Log in to leave a Comment'),
+ 'reply_text' => __( 'Leave a Comment' ),
+ 'login_text' => __( 'Log in to leave a Comment' ),
'before' => '',
'after' => '',
);
- $args = wp_parse_args($args, $defaults);
+ $args = wp_parse_args( $args, $defaults );
- $post = get_post($post);
+ $post = get_post( $post );
if ( ! comments_open( $post->ID ) ) {
return false;
}
- if ( get_option('comment_registration') && ! is_user_logged_in() ) {
- $link = sprintf( '',
+ if ( get_option( 'comment_registration' ) && ! is_user_logged_in() ) {
+ $link = sprintf(
+ '',
wp_login_url( get_permalink() ),
$args['login_text']
);
} else {
- $onclick = sprintf( 'return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )',
- $args['add_below'], $post->ID, $args['respond_id']
+ $onclick = sprintf(
+ 'return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )',
+ $args['add_below'],
+ $post->ID,
+ $args['respond_id']
);
- $link = sprintf( "",
+ $link = sprintf(
+ "",
get_permalink( $post->ID ) . '#' . $args['respond_id'],
$onclick,
$args['reply_text']
@@ -1764,8 +1826,8 @@
* Default current post.
* @return string|bool|null Link to show comment form, if successful. False, if comments are closed.
*/
-function post_reply_link($args = array(), $post = null) {
- echo get_post_reply_link($args, $post);
+function post_reply_link( $args = array(), $post = null ) {
+ echo get_post_reply_link( $args, $post );
}
/**
@@ -1777,11 +1839,12 @@
* @return string
*/
function get_cancel_comment_reply_link( $text = '' ) {
- if ( empty($text) )
- $text = __('Click here to cancel reply.');
+ if ( empty( $text ) ) {
+ $text = __( 'Click here to cancel reply.' );
+ }
- $style = isset($_GET['replytocom']) ? '' : ' style="display:none;"';
- $link = esc_html( remove_query_arg('replytocom') ) . '#respond';
+ $style = isset( $_GET['replytocom'] ) ? '' : ' style="display:none;"';
+ $link = esc_html( remove_query_arg( array( 'replytocom', 'unapproved', 'moderation-hash' ) ) ) . '#respond';
$formatted_link = '';
@@ -1805,7 +1868,7 @@
* @param string $text Optional. Text to display for cancel reply link. Default empty.
*/
function cancel_comment_reply_link( $text = '' ) {
- echo get_cancel_comment_reply_link($text);
+ echo get_cancel_comment_reply_link( $text );
}
/**
@@ -1817,12 +1880,13 @@
* @return string Hidden input HTML for replying to comments
*/
function get_comment_id_fields( $id = 0 ) {
- if ( empty( $id ) )
+ if ( empty( $id ) ) {
$id = get_the_ID();
+ }
- $replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
- $result = "\n";
- $result .= "\n";
+ $replytoid = isset( $_GET['replytocom'] ) ? (int) $_GET['replytocom'] : 0;
+ $result = "\n";
+ $result .= "\n";
/**
* Filters the returned comment id fields.
@@ -1870,17 +1934,21 @@
function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
global $comment;
- if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
- if ( false === $replytext ) $replytext = __( 'Leave a Reply to %s' );
-
- $replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
+ if ( false === $noreplytext ) {
+ $noreplytext = __( 'Leave a Reply' );
+ }
+ if ( false === $replytext ) {
+ $replytext = __( 'Leave a Reply to %s' );
+ }
- if ( 0 == $replytoid )
+ $replytoid = isset( $_GET['replytocom'] ) ? (int) $_GET['replytocom'] : 0;
+
+ if ( 0 == $replytoid ) {
echo $noreplytext;
- else {
+ } else {
// Sets the global so that template tags can be used in the comment form.
- $comment = get_comment($replytoid);
- $author = ( $linktoparent ) ? '' . get_comment_author( $comment ) . '' : get_comment_author( $comment );
+ $comment = get_comment( $replytoid );
+ $author = ( $linktoparent ) ? '' . get_comment_author( $comment ) . '' : get_comment_author( $comment );
printf( $replytext, $author );
}
}
@@ -1928,7 +1996,7 @@
$in_comment_loop = true;
- $comment_alt = $comment_thread_alt = 0;
+ $comment_alt = $comment_thread_alt = 0;
$comment_depth = 1;
$defaults = array(
@@ -1964,13 +2032,15 @@
// Figure out what comments we'll be looping through ($_comments)
if ( null !== $comments ) {
$comments = (array) $comments;
- if ( empty($comments) )
+ if ( empty( $comments ) ) {
return;
+ }
if ( 'all' != $r['type'] ) {
- $comments_by_type = separate_comments($comments);
- if ( empty($comments_by_type[$r['type']]) )
+ $comments_by_type = separate_comments( $comments );
+ if ( empty( $comments_by_type[ $r['type'] ] ) ) {
return;
- $_comments = $comments_by_type[$r['type']];
+ }
+ $_comments = $comments_by_type[ $r['type'] ];
} else {
$_comments = $comments;
}
@@ -1990,16 +2060,17 @@
$comment_args = array(
'post_id' => get_the_ID(),
'orderby' => 'comment_date_gmt',
- 'order' => 'ASC',
- 'status' => 'approve',
+ 'order' => 'ASC',
+ 'status' => 'approve',
);
if ( is_user_logged_in() ) {
$comment_args['include_unapproved'] = get_current_user_id();
} else {
- $commenter = wp_get_current_commenter();
- if ( $commenter['comment_author_email'] ) {
- $comment_args['include_unapproved'] = $commenter['comment_author_email'];
+ $unapproved_email = wp_get_unapproved_comment_author_email();
+
+ if ( $unapproved_email ) {
+ $comment_args['include_unapproved'] = array( $unapproved_email );
}
}
@@ -2017,74 +2088,80 @@
}
}
- // Otherwise, fall back on the comments from `$wp_query->comments`.
+ // Otherwise, fall back on the comments from `$wp_query->comments`.
} else {
- if ( empty($wp_query->comments) )
+ if ( empty( $wp_query->comments ) ) {
return;
+ }
if ( 'all' != $r['type'] ) {
- if ( empty($wp_query->comments_by_type) )
- $wp_query->comments_by_type = separate_comments($wp_query->comments);
- if ( empty($wp_query->comments_by_type[$r['type']]) )
+ if ( empty( $wp_query->comments_by_type ) ) {
+ $wp_query->comments_by_type = separate_comments( $wp_query->comments );
+ }
+ if ( empty( $wp_query->comments_by_type[ $r['type'] ] ) ) {
return;
- $_comments = $wp_query->comments_by_type[$r['type']];
+ }
+ $_comments = $wp_query->comments_by_type[ $r['type'] ];
} else {
$_comments = $wp_query->comments;
}
if ( $wp_query->max_num_comment_pages ) {
$default_comments_page = get_option( 'default_comments_page' );
- $cpage = get_query_var( 'cpage' );
+ $cpage = get_query_var( 'cpage' );
if ( 'newest' === $default_comments_page ) {
$r['cpage'] = $cpage;
- /*
- * When first page shows oldest comments, post permalink is the same as
- * the comment permalink.
- */
+ /*
+ * When first page shows oldest comments, post permalink is the same as
+ * the comment permalink.
+ */
} elseif ( $cpage == 1 ) {
$r['cpage'] = '';
} else {
$r['cpage'] = $cpage;
}
- $r['page'] = 0;
+ $r['page'] = 0;
$r['per_page'] = 0;
}
}
}
if ( '' === $r['per_page'] && get_option( 'page_comments' ) ) {
- $r['per_page'] = get_query_var('comments_per_page');
+ $r['per_page'] = get_query_var( 'comments_per_page' );
}
- if ( empty($r['per_page']) ) {
+ if ( empty( $r['per_page'] ) ) {
$r['per_page'] = 0;
- $r['page'] = 0;
+ $r['page'] = 0;
}
if ( '' === $r['max_depth'] ) {
- if ( get_option('thread_comments') )
- $r['max_depth'] = get_option('thread_comments_depth');
- else
+ if ( get_option( 'thread_comments' ) ) {
+ $r['max_depth'] = get_option( 'thread_comments_depth' );
+ } else {
$r['max_depth'] = -1;
+ }
}
if ( '' === $r['page'] ) {
- if ( empty($overridden_cpage) ) {
- $r['page'] = get_query_var('cpage');
+ if ( empty( $overridden_cpage ) ) {
+ $r['page'] = get_query_var( 'cpage' );
} else {
- $threaded = ( -1 != $r['max_depth'] );
- $r['page'] = ( 'newest' == get_option('default_comments_page') ) ? get_comment_pages_count($_comments, $r['per_page'], $threaded) : 1;
+ $threaded = ( -1 != $r['max_depth'] );
+ $r['page'] = ( 'newest' == get_option( 'default_comments_page' ) ) ? get_comment_pages_count( $_comments, $r['per_page'], $threaded ) : 1;
set_query_var( 'cpage', $r['page'] );
}
}
// Validation check
- $r['page'] = intval($r['page']);
- if ( 0 == $r['page'] && 0 != $r['per_page'] )
+ $r['page'] = intval( $r['page'] );
+ if ( 0 == $r['page'] && 0 != $r['per_page'] ) {
$r['page'] = 1;
+ }
- if ( null === $r['reverse_top_level'] )
- $r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
+ if ( null === $r['reverse_top_level'] ) {
+ $r['reverse_top_level'] = ( 'desc' == get_option( 'comment_order' ) );
+ }
wp_queue_comments_for_comment_meta_lazyload( $_comments );
@@ -2170,8 +2247,9 @@
* @param int|WP_Post $post_id Post ID or WP_Post object to generate the form for. Default current post.
*/
function comment_form( $args = array(), $post_id = null ) {
- if ( null === $post_id )
+ if ( null === $post_id ) {
$post_id = get_the_ID();
+ }
// Exit the function when comments for the post are closed.
if ( ! comments_open( $post_id ) ) {
@@ -2185,23 +2263,24 @@
return;
}
- $commenter = wp_get_current_commenter();
- $user = wp_get_current_user();
+ $commenter = wp_get_current_commenter();
+ $user = wp_get_current_user();
$user_identity = $user->exists() ? $user->display_name : '';
$args = wp_parse_args( $args );
- if ( ! isset( $args['format'] ) )
+ if ( ! isset( $args['format'] ) ) {
$args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
+ }
$req = get_option( 'require_name_email' );
$html_req = ( $req ? " required='required'" : '' );
$html5 = 'html5' === $args['format'];
- $fields = array(
- 'author' => '',
- 'email' => '',
- 'url' => '',
);
@@ -2223,29 +2302,29 @@
*
* @since 3.0.0
*
- * @param array $fields The default comment fields.
+ * @param string[] $fields Array of the default comment fields.
*/
- $fields = apply_filters( 'comment_form_default_fields', $fields );
+ $fields = apply_filters( 'comment_form_default_fields', $fields );
$defaults = array(
'fields' => $fields,
'comment_field' => '',
/** This filter is documented in wp-includes/link-template.php */
'must_log_in' => '' . sprintf(
- /* translators: %s: login URL */
- __( 'You must be logged in to post a comment.' ),
- wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
- ) . '
',
+ /* translators: %s: login URL */
+ __( 'You must be logged in to post a comment.' ),
+ wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
+ ) . '',
/** This filter is documented in wp-includes/link-template.php */
'logged_in_as' => '' . sprintf(
- /* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
- __( 'Logged in as %3$s. Log out?' ),
- get_edit_user_link(),
- /* translators: %s: user name */
- esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
- $user_identity,
- wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
- ) . '
',
- 'comment_notes_before' => '',
+ /* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
+ __( 'Logged in as %3$s. Log out?' ),
+ get_edit_user_link(),
+ /* translators: %s: user name */
+ esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
+ $user_identity,
+ wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
+ ) . '',
+ 'comment_notes_before' => '',
'comment_notes_after' => '',
'action' => site_url( '/wp-comments-post.php' ),
'id_form' => 'commentform',
@@ -2301,7 +2380,7 @@
echo $args['title_reply_after'];
- if ( get_option( 'comment_registration' ) && !is_user_logged_in() ) :
+ if ( get_option( 'comment_registration' ) && ! is_user_logged_in() ) :
echo $args['must_log_in'];
/**
* Fires after the HTML-formatted 'must log in after' message in the comment form.
@@ -2309,7 +2388,8 @@
* @since 3.0.0
*/
do_action( 'comment_form_must_log_in_after' );
- else : ?>
+ else :
+ ?>