enmi-conf.org: comparison wp/wp-includes/comment-template.php

equal deleted inserted replaced

-:c7c34916027a
+:177826044cd9
 *
 * @since 1.5.0
 * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
 *
 * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to retrieve the author.
-*									 Default current comment.
+*                                   Default current comment.
 * @return string The comment author
 */
 function get_comment_author( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
 	if ( empty( $comment->comment_author ) ) {
-		if ( $comment->user_id && $user = get_userdata( $comment->user_id ) )
+		if ( $comment->user_id && $user = get_userdata( $comment->user_id ) ) {
 			$author = $user->display_name;
-		else
+		} else {
-			$author = __('Anonymous');
+			$author = __( 'Anonymous' );
+		}
 	} else {
 		$author = $comment->comment_author;
 	}
 	/**
 *
 * @since 0.71
 * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
 *
 * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author.
-*									 Default current comment.
+*                                   Default current comment.
 */
 function comment_author( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
 	$author  = get_comment_author( $comment );
 *
 * @since 1.5.0
 * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
 *
 * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's email.
-*									 Default current comment.
+*                                   Default current comment.
 * @return string The current comment author's email
 */
 function get_comment_author_email( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
 /**
 * Display the email of the author of the current global $comment.
 *
 * Care should be taken to protect the email address and assure that email
-* harvesters do not capture your commentors' email address. Most assume that
+* harvesters do not capture your commenter's email address. Most assume that
 * their email address will not appear in raw form on the site. Doing so will
 * enable anyone, including those that people don't want to get the email
 * address and use it for their own means good and bad.
 *
 * @since 0.71
 * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
 *
 * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's email.
-*									 Default current comment.
+*                                   Default current comment.
 */
 function comment_author_email( $comment_ID = 0 ) {
 	$comment      = get_comment( $comment_ID );
 	$author_email = get_comment_author_email( $comment );
 /**
 * Display the html email link to the author of the current comment.
 *
 * Care should be taken to protect the email address and assure that email
-* harvesters do not capture your commentors' email address. Most assume that
+* harvesters do not capture your commenter's email address. Most assume that
 * their email address will not appear in raw form on the site. Doing so will
 * enable anyone, including those that people don't want to get the email
 * address and use it for their own means good and bad.
 *
 * @since 0.71
 /**
 * Return the html email link to the author of the current comment.
 *
 * Care should be taken to protect the email address and assure that email
-* harvesters do not capture your commentors' email address. Most assume that
+* harvesters do not capture your commenter's email address. Most assume that
 * their email address will not appear in raw form on the site. Doing so will
 * enable anyone, including those that people don't want to get the email
 * address and use it for their own means good and bad.
 *
 * @since 2.7.0
 	 * @param string     $comment_author_email The comment author's email address.
 	 * @param WP_Comment $comment              The comment object.
 	 */
 	$email = apply_filters( 'comment_email', $comment->comment_author_email, $comment );
-	if ((!empty($email)) && ($email != '@')) {
+	if ( ( ! empty( $email ) ) && ( $email != '@' ) ) {
-	$display = ($linktext != '') ? $linktext : $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 .= $after;
 		return $return;
 	} else {
 		return '';
 	}
 }
 *
 * @since 1.5.0
 * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
 *
 * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's link.
-*									 Default current comment.
+*                                   Default current comment.
 * @return string The comment author name or HTML link for author's URL.
 */
 function get_comment_author_link( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
 	$url     = get_comment_author_url( $comment );
 	$author  = get_comment_author( $comment );
-	if ( empty( $url ) || 'http://' == $url )
+	if ( empty( $url ) || 'http://' == $url ) {
 		$return = $author;
-	else
+	} else {
 		$return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
+	}
 	/**
 	 * Filters the comment author's link for display.
 	 *
 	 * @since 1.5.0
 *
 * @since 0.71
 * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
 *
 * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's link.
-*									 Default current comment.
+*                                   Default current comment.
 */
 function comment_author_link( $comment_ID = 0 ) {
 	echo get_comment_author_link( $comment_ID );
 }
 *
 * @since 1.5.0
 * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
 *
 * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's IP address.
-*									 Default current comment.
+*                                   Default current comment.
 * @return string Comment author's IP address.
 */
 function get_comment_author_IP( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
 *
 * @since 0.71
 * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
 *
 * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's IP address.
-*									 Default current comment.
+*                                   Default current comment.
 */
 function comment_author_IP( $comment_ID = 0 ) {
 	echo esc_html( get_comment_author_IP( $comment_ID ) );
 }
 *
 * @since 1.5.0
 * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
 *
 * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's URL.
-*									 Default current comment.
+*                                   Default current comment.
 * @return string Comment author URL.
 */
 function get_comment_author_url( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
-	$url = '';
+	$url     = '';
-	$id = 0;
+	$id      = 0;
 	if ( ! empty( $comment ) ) {
 		$author_url = ( 'http://' == $comment->comment_author_url ) ? '' : $comment->comment_author_url;
-		$url = esc_url( $author_url, array( 'http', 'https' ) );
+		$url        = esc_url( $author_url, array( 'http', 'https' ) );
-		$id = $comment->comment_ID;
+		$id         = $comment->comment_ID;
 	}
 	/**
 	 * Filters the comment author's URL.
 	 *
 *
 * @since 0.71
 * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
 *
 * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's URL.
-*									 Default current comment.
+*                                   Default current comment.
 */
 function comment_author_url( $comment_ID = 0 ) {
 	$comment    = get_comment( $comment_ID );
 	$author_url = get_comment_author_url( $comment );
 * @param int|WP_Comment $comment  Optional. Comment ID or WP_Comment object.
 *                                 Default is the current comment.
 * @return string The HTML link between the $before and $after parameters.
 */
 function get_comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
-	$url = get_comment_author_url( $comment );
+	$url     = get_comment_author_url( $comment );
-	$display = ($linktext != '') ? $linktext : $url;
+	$display = ( $linktext != '' ) ? $linktext : $url;
 	$display = str_replace( 'http://www.', '', $display );
 	$display = str_replace( 'http://', '', $display );
-	if ( '/' == substr($display, -1) ) {
+	if ( '/' == substr( $display, -1 ) ) {
-		$display = substr($display, 0, -1);
+		$display = substr( $display, 0, -1 );
 	}
 	$return = "$before<a href='$url' rel='external'>$display</a>$after";
 	/**
 * @return string If `$echo` is false, the class will be returned. Void otherwise.
 */
 function comment_class( $class = '', $comment = null, $post_id = null, $echo = true ) {
 	// Separates classes with a single space, collates classes for comment DIV
 	$class = 'class="' . join( ' ', get_comment_class( $class, $comment, $post_id ) ) . '"';
-	if ( $echo)
+	if ( $echo ) {
 		echo $class;
-	else
+	} else {
 		return $class;
+	}
 }
 /**
 * Returns the classes for the comment div as an array.
 *
 	// Add classes for comment authors that are registered users.
 	if ( $comment->user_id > 0 && $user = get_userdata( $comment->user_id ) ) {
 		$classes[] = 'byuser';
 		$classes[] = 'comment-author-' . sanitize_html_class( $user->user_nicename, $comment->user_id );
 		// For comment authors who are the author of the post
-		if ( $post = get_post($post_id) ) {
+		if ( $post = get_post( $post_id ) ) {
 			if ( $comment->user_id === $post->post_author ) {
 				$classes[] = 'bypostauthor';
 			}
 		}
 	}
-	if ( empty($comment_alt) )
+	if ( empty( $comment_alt ) ) {
 		$comment_alt = 0;
-	if ( empty($comment_depth) )
+	}
+	if ( empty( $comment_depth ) ) {
 		$comment_depth = 1;
-	if ( empty($comment_thread_alt) )
+	}
+	if ( empty( $comment_thread_alt ) ) {
 		$comment_thread_alt = 0;
+	}
 	if ( $comment_alt % 2 ) {
 		$classes[] = 'odd';
 		$classes[] = 'alt';
 	} else {
 		$comment_thread_alt++;
 	}
 	$classes[] = "depth-$comment_depth";
-	if ( !empty($class) ) {
+	if ( ! empty( $class ) ) {
-		if ( !is_array( $class ) )
+		if ( ! is_array( $class ) ) {
-			$class = preg_split('#\s+#', $class);
+			$class = preg_split( '#\s+#', $class );
-		$classes = array_merge($classes, $class);
+		}
-	}
+		$classes = array_merge( $classes, $class );
+	}
-	$classes = array_map('esc_attr', $classes);
+	$classes = array_map( 'esc_attr', $classes );
 	/**
 	 * Filters the returned CSS classes for the current comment.
 	 *
 	 * @since 2.7.0
 	 *
-	 * @param array       $classes    An array of comment classes.
+	 * @param string[]    $classes    An array of comment classes.
 	 * @param string      $class      A comma-separated list of additional classes added to the list.
 	 * @param int         $comment_id The comment id.
 	 * @param WP_Comment  $comment    The comment object.
 	 * @param int|WP_Post $post_id    The post ID or WP_Post object.
 	 */
 *                                    Default current comment.
 * @return string The comment's date.
 */
 function get_comment_date( $d = '', $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
-	if ( '' == $d )
+	if ( '' == $d ) {
-		$date = mysql2date(get_option('date_format'), $comment->comment_date);
+		$date = mysql2date( get_option( 'date_format' ), $comment->comment_date );
-	else
+	} else {
-		$date = mysql2date($d, $comment->comment_date);
+		$date = mysql2date( $d, $comment->comment_date );
+	}
 	/**
 	 * Filters the returned comment date.
 	 *
 	 * @since 1.5.0
 	 *
 * @param int|WP_Comment $comment_ID  WP_Comment or ID of the comment for which to get the excerpt.
 *                                    Default current comment.
 * @return string The maybe truncated comment with 20 words or less.
 */
 function get_comment_excerpt( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+	$comment      = get_comment( $comment_ID );
 	$comment_text = strip_tags( str_replace( array( "\n", "\r" ), ' ', $comment->comment_content ) );
-	$words = explode( ' ', $comment_text );
+	$words        = explode( ' ', $comment_text );
 	/**
 	 * Filters the amount of words used in the comment excerpt.
 	 *
 	 * @since 4.4.0
 * @return string The permalink to the given comment.
 */
 function get_comment_link( $comment = null, $args = array() ) {
 	global $wp_rewrite, $in_comment_loop;
-	$comment = get_comment($comment);
+	$comment = get_comment( $comment );
 	// Back-compat.
 	if ( ! is_array( $args ) ) {
 		$args = array( 'page' => $args );
 	}
 		'page'      => '',
 		'per_page'  => '',
 		'max_depth' => '',
 		'cpage'     => null,
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args     = wp_parse_args( $args, $defaults );
 	$link = get_permalink( $comment->comment_post_ID );
 	// The 'cpage' param takes precedence.
 	if ( ! is_null( $args['cpage'] ) ) {
 		$cpage = $args['cpage'];
-	// No 'cpage' is provided, so we calculate one.
+		// No 'cpage' is provided, so we calculate one.
 	} else {
 		if ( '' === $args['per_page'] && get_option( 'page_comments' ) ) {
-			$args['per_page'] = get_option('comments_per_page');
+			$args['per_page'] = get_option( 'comments_per_page' );
 		}
 		if ( empty( $args['per_page'] ) ) {
 			$args['per_page'] = 0;
-			$args['page'] = 0;
+			$args['page']     = 0;
 		}
 		$cpage = $args['page'];
 		if ( '' == $cpage ) {
 			$link = user_trailingslashit( $link, 'comment' );
 		} elseif ( $cpage ) {
 			$link = add_query_arg( 'cpage', $cpage, $link );
 		}
 	}
 	if ( $wp_rewrite->using_permalinks() ) {
 		$link = user_trailingslashit( $link, 'comment' );
 	}
 *
 * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
 * @return string The link to the comments.
 */
 function get_comments_link( $post_id = 0 ) {
-	$hash = get_comments_number( $post_id ) ? '#comments' : '#respond';
+	$hash          = get_comments_number( $post_id ) ? '#comments' : '#respond';
 	$comments_link = get_permalink( $post_id ) . $hash;
 	/**
 	 * Filters the returned post comments permalink.
 	 *
 *
 * @param string $deprecated   Not Used.
 * @param string $deprecated_2 Not Used.
 */
 function comments_link( $deprecated = '', $deprecated_2 = '' ) {
-	if ( !empty( $deprecated ) )
+	if ( ! empty( $deprecated ) ) {
 		_deprecated_argument( __FUNCTION__, '0.72' );
-	if ( !empty( $deprecated_2 ) )
+	}
+	if ( ! empty( $deprecated_2 ) ) {
 		_deprecated_argument( __FUNCTION__, '1.3.0' );
+	}
 	echo esc_url( get_comments_link() );
 }
 /**
 * Retrieves the amount of comments a post has.
 	$post = get_post( $post_id );
 	if ( ! $post ) {
 		$count = 0;
 	} else {
-		$count = $post->comment_count;
+		$count   = $post->comment_count;
 		$post_id = $post->ID;
 	}
 	/**
 	 * Filters the returned comment count for a post.
 */
 function get_comment_time( $d = '', $gmt = false, $translate = true ) {
 	$comment = get_comment();
 	$comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;
-	if ( '' == $d )
+	if ( '' == $d ) {
-		$date = mysql2date(get_option('time_format'), $comment_date, $translate);
+		$date = mysql2date( get_option( 'time_format' ), $comment_date, $translate );
-	else
+	} else {
-		$date = mysql2date($d, $comment_date, $translate);
+		$date = mysql2date( $d, $comment_date, $translate );
+	}
 	/**
 	 * Filters the returned comment time.
 	 *
 	 * @since 1.5.0
 * @since 0.71
 *
 * @param string $d Optional. The format of the time. Default user's settings.
 */
 function comment_time( $d = '' ) {
-	echo get_comment_time($d);
+	echo get_comment_time( $d );
 }
 /**
 * Retrieve the comment type of the current comment.
 *
 *                                   Default current comment.
 * @return string The comment type.
 */
 function get_comment_type( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
-	if ( '' == $comment->comment_type )
+	if ( '' == $comment->comment_type ) {
 		$comment->comment_type = 'comment';
+	}
 	/**
 	 * Filters the returned comment type.
 	 *
 	 * @since 1.5.0
 	 * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added.
 	 *
 	 * @param string     $comment_type The type of comment, such as 'comment', 'pingback', or 'trackback'.
-	 * @param int 	     $comment_ID   The comment ID.
+	 * @param int        $comment_ID   The comment ID.
 	 * @param WP_Comment $comment      The comment object.
 	 */
 	return apply_filters( 'get_comment_type', $comment->comment_type, $comment->comment_ID, $comment );
 }
 * @param string $commenttxt   Optional. String to display for comment type. Default false.
 * @param string $trackbacktxt Optional. String to display for trackback type. Default false.
 * @param string $pingbacktxt  Optional. String to display for pingback type. Default false.
 */
 function comment_type( $commenttxt = false, $trackbacktxt = false, $pingbacktxt = false ) {
-	if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
+	if ( false === $commenttxt ) {
-	if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
+		$commenttxt = _x( 'Comment', 'noun' );
-	if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
+	}
+	if ( false === $trackbacktxt ) {
+		$trackbacktxt = __( 'Trackback' );
+	}
+	if ( false === $pingbacktxt ) {
+		$pingbacktxt = __( 'Pingback' );
+	}
 	$type = get_comment_type();
-	switch( $type ) {
+	switch ( $type ) {
-		case 'trackback' :
+		case 'trackback':
 			echo $trackbacktxt;
 			break;
-		case 'pingback' :
+		case 'pingback':
 			echo $pingbacktxt;
 			break;
-		default :
+		default:
 			echo $commenttxt;
 	}
 }
 /**
 * @since 1.5.0
 *
 * @return string The trackback URL after being filtered.
 */
 function get_trackback_url() {
-	if ( '' != get_option('permalink_structure') )
+	if ( '' != get_option( 'permalink_structure' ) ) {
-		$tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
+		$tb_url = trailingslashit( get_permalink() ) . user_trailingslashit( 'trackback', 'single_trackback' );
-	else
+	} else {
-		$tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
+		$tb_url = get_option( 'siteurl' ) . '/wp-trackback.php?p=' . get_the_ID();
+	}
 	/**
 	 * Filters the returned trackback URL.
 	 *
 	 * @since 2.2.0
 * @return void|string Should only be used to echo the trackback URL, use get_trackback_url()
 *                     for the result instead.
 */
 function trackback_url( $deprecated_echo = true ) {
 	if ( true !== $deprecated_echo ) {
-		_deprecated_argument( __FUNCTION__, '2.5.0',
+		_deprecated_argument(
+			__FUNCTION__,
+			'2.5.0',
 			/* translators: %s: get_trackback_url() */
-			sprintf( __( 'Use %s instead if you do not want the value echoed.' ),
+			sprintf(
+				__( 'Use %s instead if you do not want the value echoed.' ),
 				'<code>get_trackback_url()</code>'
 			)
 		);
 	}
 	echo '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 			xmlns:dc="http://purl.org/dc/elements/1.1/"
 			xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/">
 		<rdf:Description rdf:about="';
 	the_permalink();
-	echo '"'."\n";
+	echo '"' . "\n";
 	echo '    dc:identifier="';
 	the_permalink();
-	echo '"'."\n";
+	echo '"' . "\n";
-	echo '    dc:title="'.str_replace('--', '&#x2d;&#x2d;', wptexturize(strip_tags(get_the_title()))).'"'."\n";
+	echo '    dc:title="' . str_replace( '--', '&#x2d;&#x2d;', wptexturize( strip_tags( get_the_title() ) ) ) . '"' . "\n";
-	echo '    trackback:ping="'.get_trackback_url().'"'." />\n";
+	echo '    trackback:ping="' . get_trackback_url() . '"' . " />\n";
 	echo '</rdf:RDF>';
 }
 /**
-* Whether the current post is open for comments.
+* Determines whether the current post is open for comments.
+*
+* For more information on this and similar theme functions, check out
+* the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
+* Conditional Tags} article in the Theme Developer Handbook.
 *
 * @since 1.5.0
 *
 * @param int|WP_Post $post_id Post ID or WP_Post object. Default current post.
 * @return bool True if the comments are open.
 */
 function comments_open( $post_id = null ) {
-	$_post = get_post($post_id);
+	$_post = get_post( $post_id );
 	$post_id = $_post ? $_post->ID : 0;
-	$open = ( 'open' == $_post->comment_status );
+	$open    = ( 'open' == $_post->comment_status );
 	/**
 	 * Filters whether the current post is open for comments.
 	 *
 	 * @since 2.5.0
 	 */
 	return apply_filters( 'comments_open', $open, $post_id );
 }
 /**
-* Whether the current post is open for pings.
+* Determines whether the current post is open for pings.
+*
+* For more information on this and similar theme functions, check out
+* the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
+* Conditional Tags} article in the Theme Developer Handbook.
 *
 * @since 1.5.0
 *
 * @param int|WP_Post $post_id Post ID or WP_Post object. Default current post.
 * @return bool True if pings are accepted
 */
 function pings_open( $post_id = null ) {
-	$_post = get_post($post_id);
+	$_post = get_post( $post_id );
 	$post_id = $_post ? $_post->ID : 0;
-	$open = ( 'open' == $_post->ping_status );
+	$open    = ( 'open' == $_post->ping_status );
 	/**
 	 * Filters whether the current post is open for pings.
 	 *
 	 * @since 2.5.0
 * Backported to 2.0.10.
 *
 * @since 2.1.3
 */
 function wp_comment_form_unfiltered_html_nonce() {
-	$post = get_post();
+	$post    = get_post();
 	$post_id = $post ? $post->ID : 0;
 	if ( current_user_can( 'unfiltered_html' ) ) {
 		wp_nonce_field( 'unfiltered-html-comment_' . $post_id, '_wp_unfiltered_html_comment_disabled', false );
 		echo "<script>(function(){if(window===window.parent){document.getElementById('_wp_unfiltered_html_comment_disabled').name='_wp_unfiltered_html_comment';}})();</script>\n";
 *                                  Default false.
 */
 function comments_template( $file = '/comments.php', $separate_comments = false ) {
 	global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage;
-	if ( !(is_single() || is_page() || $withcomments) || empty($post) )
+	if ( ! ( is_single() || is_page() || $withcomments ) || empty( $post ) ) {
 		return;
+	}
-	if ( empty($file) )
+	if ( empty( $file ) ) {
 		$file = '/comments.php';
+	}
-	$req = get_option('require_name_email');
+	$req = get_option( 'require_name_email' );
 	/*
 	 * Comment author information fetched from the comment cookies.
 	 */
 	$commenter = wp_get_current_commenter();
 	$comment_author_email = $commenter['comment_author_email'];
 	/*
 	 * The url of the current comment author escaped for use in attributes.
 	 */
-	$comment_author_url = esc_url($commenter['comment_author_url']);
+	$comment_author_url = esc_url( $commenter['comment_author_url'] );
 	$comment_args = array(
-		'orderby' => 'comment_date_gmt',
+		'orderby'                   => 'comment_date_gmt',
-		'order' => 'ASC',
+		'order'                     => 'ASC',
-		'status'  => 'approve',
+		'status'                    => 'approve',
-		'post_id' => $post->ID,
+		'post_id'                   => $post->ID,
-		'no_found_rows' => false,
+		'no_found_rows'             => false,
 		'update_comment_meta_cache' => false, // We lazy-load comment meta for performance.
 	);
-	if ( get_option('thread_comments') ) {
+	if ( get_option( 'thread_comments' ) ) {
 		$comment_args['hierarchical'] = 'threaded';
 	} else {
 		$comment_args['hierarchical'] = false;
 	}
 	if ( $user_ID ) {
 		$comment_args['include_unapproved'] = array( $user_ID );
-	} elseif ( ! empty( $comment_author_email ) ) {
+	} else {
-		$comment_args['include_unapproved'] = array( $comment_author_email );
+		$unapproved_email = wp_get_unapproved_comment_author_email();
+		if ( $unapproved_email ) {
+			$comment_args['include_unapproved'] = array( $unapproved_email );
+		}
 	}
 	$per_page = 0;
 	if ( get_option( 'page_comments' ) ) {
 		$per_page = (int) get_query_var( 'comments_per_page' );
 		if ( 0 === $per_page ) {
 			$per_page = (int) get_option( 'comments_per_page' );
 		}
 		$comment_args['number'] = $per_page;
-		$page = (int) get_query_var( 'cpage' );
+		$page                   = (int) get_query_var( 'cpage' );
 		if ( $page ) {
 			$comment_args['offset'] = ( $page - 1 ) * $per_page;
 		} elseif ( 'oldest' === get_option( 'default_comments_page' ) ) {
 			$comment_args['offset'] = 0;
 	 *     @type bool|string  $hierarchical              Whether to query for comments hierarchically.
 	 *     @type int          $offset                    Comment offset.
 	 *     @type int          $number                    Number of comments to fetch.
 	 * }
 	 */
-	$comment_args = apply_filters( 'comments_template_query_args', $comment_args );
+	$comment_args  = apply_filters( 'comments_template_query_args', $comment_args );
 	$comment_query = new WP_Comment_Query( $comment_args );
-	$_comments = $comment_query->comments;
+	$_comments     = $comment_query->comments;
 	// Trees must be flattened before they're passed to the walker.
 	if ( $comment_args['hierarchical'] ) {
 		$comments_flat = array();
 		foreach ( $_comments as $_comment ) {
 			$comments_flat[]  = $_comment;
-			$comment_children = $_comment->get_children( array(
+			$comment_children = $_comment->get_children(
-				'format' => 'flat',
+				array(
-				'status' => $comment_args['status'],
+					'format'  => 'flat',
-				'orderby' => $comment_args['orderby']
+					'status'  => $comment_args['status'],
-			) );
+					'orderby' => $comment_args['orderby'],
+				)
+			);
 			foreach ( $comment_children as $comment_child ) {
 				$comments_flat[] = $comment_child;
 			}
 		}
 	 * @param array $comments Array of comments supplied to the comments template.
 	 * @param int   $post_ID  Post ID.
 	 */
 	$wp_query->comments = apply_filters( 'comments_array', $comments_flat, $post->ID );
-	$comments = &$wp_query->comments;
+	$comments                        = &$wp_query->comments;
-	$wp_query->comment_count = count($wp_query->comments);
+	$wp_query->comment_count         = count( $wp_query->comments );
 	$wp_query->max_num_comment_pages = $comment_query->max_num_pages;
 	if ( $separate_comments ) {
-		$wp_query->comments_by_type = separate_comments($comments);
+		$wp_query->comments_by_type = separate_comments( $comments );
-		$comments_by_type = &$wp_query->comments_by_type;
+		$comments_by_type           = &$wp_query->comments_by_type;
 	} else {
 		$wp_query->comments_by_type = array();
 	}
 	$overridden_cpage = false;
 	if ( '' == get_query_var( 'cpage' ) && $wp_query->max_num_comment_pages > 1 ) {
-		set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
+		set_query_var( 'cpage', 'newest' == get_option( 'default_comments_page' ) ? get_comment_pages_count() : 1 );
 		$overridden_cpage = true;
 	}
-	if ( !defined('COMMENTS_TEMPLATE') )
+	if ( ! defined( 'COMMENTS_TEMPLATE' ) ) {
-		define('COMMENTS_TEMPLATE', true);
+		define( 'COMMENTS_TEMPLATE', true );
+	}
 	$theme_template = STYLESHEETPATH . $file;
 	/**
 	 * Filters the path to the theme template file used for the comments template.
 	 *
 	 * @since 1.5.1
 	 *
 	 * @param string $theme_template The path to the theme template file.
 	 */
 	$include = apply_filters( 'comments_template', $theme_template );
-	if ( file_exists( $include ) )
+	if ( file_exists( $include ) ) {
 		require( $include );
-	elseif ( file_exists( TEMPLATEPATH . $file ) )
+	} elseif ( file_exists( TEMPLATEPATH . $file ) ) {
 		require( TEMPLATEPATH . $file );
-	else // Backward compat code will be removed in a future release
+	} else { // Backward compat code will be removed in a future release
-		require( ABSPATH . WPINC . '/theme-compat/comments.php');
+		require( ABSPATH . WPINC . '/theme-compat/comments.php' );
+	}
 }
 /**
 * Displays the link to the comments for the current post ID.
 *
 * @since 0.71
 *
-* @param string $zero      Optional. String to display when no comments. Default false.
+* @param false|string $zero      Optional. String to display when no comments. Default false.
-* @param string $one       Optional. String to display when only one comment is available.
+* @param false|string $one       Optional. String to display when only one comment is available. Default false.
-*                          Default false.
+* @param false|string $more      Optional. String to display when there are more than one comment. Default false.
-* @param string $more      Optional. String to display when there are more than one comment.
+* @param string       $css_class Optional. CSS class to use for comments. Default empty.
-*                          Default false.
+* @param false|string $none      Optional. String to display when comments have been turned off. Default false.
-* @param string $css_class Optional. CSS class to use for comments. Default empty.
-* @param string $none      Optional. String to display when comments have been turned off.
-*                          Default false.
 */
 function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
-	$id = get_the_ID();
+	$id     = get_the_ID();
-	$title = get_the_title();
+	$title  = get_the_title();
 	$number = get_comments_number( $id );
 	if ( false === $zero ) {
 		/* translators: %s: post title */
 		$zero = sprintf( __( 'No Comments<span class="screen-reader-text"> on %s</span>' ), $title );
 		/* translators: %s: post title */
 		$one = sprintf( __( '1 Comment<span class="screen-reader-text"> on %s</span>' ), $title );
 	}
 	if ( false === $more ) {
-		/* translators: 1: Number of comments 2: post title */
+		/* translators: 1: number of comments, 2: post title */
 		$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 ), $title );
 	}
 	if ( false === $none ) {
 		/* translators: %s: post title */
 		$none = sprintf( __( 'Comments Off<span class="screen-reader-text"> on %s</span>' ), $title );
 	}
-	if ( 0 == $number && !comments_open() && !pings_open() ) {
+	if ( 0 == $number && ! comments_open() && ! pings_open() ) {
-		echo '<span' . ((!empty($css_class)) ? ' class="' . esc_attr( $css_class ) . '"' : '') . '>' . $none . '</span>';
+		echo '<span' . ( ( ! empty( $css_class ) ) ? ' class="' . esc_attr( $css_class ) . '"' : '' ) . '>' . $none . '</span>';
 		return;
 	}
 	if ( post_password_required() ) {
 		_e( 'Enter your password to view comments.' );
 	} else {
 		comments_link();
 	}
 	echo '"';
-	if ( !empty( $css_class ) ) {
+	if ( ! empty( $css_class ) ) {
-		echo ' class="'.$css_class.'" ';
+		echo ' class="' . $css_class . '" ';
 	}
 	$attributes = '';
 	/**
 	 * Filters the comments link attributes for display.
 function get_comment_reply_link( $args = array(), $comment = null, $post = null ) {
 	$defaults = array(
 		'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 );
 	if ( 0 == $args['depth'] || $args['max_depth'] <= $args['depth'] ) {
 	 * @param WP_Post    $post    The WP_Post object.
 	 */
 	$args = apply_filters( 'comment_reply_link_args', $args, $comment, $post );
 	if ( get_option( 'comment_registration' ) && ! is_user_logged_in() ) {
-		$link = sprintf( '<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
+		$link = sprintf(
+			'<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
 			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" )',
+		$data_attributes = array(
-			$args['add_below'], $comment->comment_ID, $args['respond_id'], $post->ID
+			'commentid'      => $comment->comment_ID,
+			'postid'         => $post->ID,
+			'belowelement'   => $args['add_below'] . '-' . $comment->comment_ID,
+			'respondelement' => $args['respond_id'],
 		);
-		$link = sprintf( "<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
+		$data_attribute_string = '';
-			esc_url( add_query_arg( 'replytocom', $comment->comment_ID, get_permalink( $post->ID ) ) ) . "#" . $args['respond_id'],
-			$onclick,
+		foreach ( $data_attributes as $name => $value ) {
+			$data_attribute_string .= " data-${name}=\"" . esc_attr( $value ) . '"';
+		}
+		$data_attribute_string = trim( $data_attribute_string );
+		$link = sprintf(
+			"<a rel='nofollow' class='comment-reply-link' href='%s' %s aria-label='%s'>%s</a>",
+			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']
 		);
 	}
 * @param int         $comment Comment being replied to. Default current comment.
 * @param int|WP_Post $post    Post ID or WP_Post object the comment is going to be displayed on.
 *                             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) {
+function comment_reply_link( $args = array(), $comment = null, $post = null ) {
-	echo get_comment_reply_link($args, $comment, $post);
+	echo get_comment_reply_link( $args, $comment, $post );
 }
 /**
 * Retrieve HTML content for reply to post link.
 *
 * }
 * @param int|WP_Post $post    Optional. Post ID or WP_Post object the comment is going to be displayed on.
 *                             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'),
+		'reply_text' => __( 'Leave a Comment' ),
-		'login_text' => __('Log in to 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() ) {
+	if ( get_option( 'comment_registration' ) && ! is_user_logged_in() ) {
-		$link = sprintf( '<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
+		$link = sprintf(
+			'<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
 			wp_login_url( get_permalink() ),
 			$args['login_text']
 		);
 	} else {
-		$onclick = sprintf( 'return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )',
+		$onclick = sprintf(
-			$args['add_below'], $post->ID, $args['respond_id']
+			'return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )',
+			$args['add_below'],
+			$post->ID,
+			$args['respond_id']
 		);
-		$link = sprintf( "<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s'>%s</a>",
+		$link = sprintf(
+			"<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s'>%s</a>",
 			get_permalink( $post->ID ) . '#' . $args['respond_id'],
 			$onclick,
 			$args['reply_text']
 		);
 	}
 * @param array       $args Optional. Override default options,
 * @param int|WP_Post $post Post ID or WP_Post object the comment is going to be displayed on.
 *                          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) {
+function post_reply_link( $args = array(), $post = null ) {
-	echo get_post_reply_link($args, $post);
+	echo get_post_reply_link( $args, $post );
 }
 /**
 * Retrieve HTML content for cancel comment reply link.
 *
 *
 * @param string $text Optional. Text to display for cancel reply link. Default empty.
 * @return string
 */
 function get_cancel_comment_reply_link( $text = '' ) {
-	if ( empty($text) )
+	if ( empty( $text ) ) {
-		$text = __('Click here to cancel reply.');
+		$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 = '<a rel="nofollow" id="cancel-comment-reply-link" href="' . $link . '"' . $style . '>' . $text . '</a>';
 	/**
 	 * Filters the cancel comment reply link HTML.
 * @since 2.7.0
 *
 * @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 );
 }
 /**
 * Retrieve hidden input HTML for replying to comments.
 *
 *
 * @param int $id Optional. Post ID. Default current post ID.
 * @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  = "<input type='hidden' name='comment_post_ID' value='$id' id='comment_post_ID' />\n";
+	$replytoid = isset( $_GET['replytocom'] ) ? (int) $_GET['replytocom'] : 0;
-	$result .= "<input type='hidden' name='comment_parent' id='comment_parent' value='$replytoid' />\n";
+	$result    = "<input type='hidden' name='comment_post_ID' value='$id' id='comment_post_ID' />\n";
+	$result   .= "<input type='hidden' name='comment_parent' id='comment_parent' value='$replytoid' />\n";
 	/**
 	 * Filters the returned comment id fields.
 	 *
 	 * @since 3.0.0
 *                             to their comment. Default true.
 */
 function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
 	global $comment;
-	if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
+	if ( false === $noreplytext ) {
-	if ( false === $replytext ) $replytext = __( 'Leave a Reply to %s' );
+		$noreplytext = __( 'Leave a Reply' );
+	}
-	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
+	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);
+		$comment = get_comment( $replytoid );
-		$author = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author( $comment ) . '</a>' : get_comment_author( $comment );
+		$author  = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author( $comment ) . '</a>' : get_comment_author( $comment );
 		printf( $replytext, $author );
 	}
 }
 /**
 function wp_list_comments( $args = array(), $comments = null ) {
 	global $wp_query, $comment_alt, $comment_depth, $comment_thread_alt, $overridden_cpage, $in_comment_loop;
 	$in_comment_loop = true;
-	$comment_alt = $comment_thread_alt = 0;
+	$comment_alt   = $comment_thread_alt = 0;
 	$comment_depth = 1;
 	$defaults = array(
 		'walker'            => null,
 		'max_depth'         => '',
 	$r = apply_filters( 'wp_list_comments_args', $r );
 	// 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);
+			$comments_by_type = separate_comments( $comments );
-			if ( empty($comments_by_type[$r['type']]) )
+			if ( empty( $comments_by_type[ $r['type'] ] ) ) {
 				return;
-			$_comments = $comments_by_type[$r['type']];
+			}
+			$_comments = $comments_by_type[ $r['type'] ];
 		} else {
 			$_comments = $comments;
 		}
 	} else {
 		/*
 			$current_per_page = get_query_var( 'comments_per_page' );
 			if ( $r['page'] != $current_cpage || $r['per_page'] != $current_per_page ) {
 				$comment_args = array(
 					'post_id' => get_the_ID(),
 					'orderby' => 'comment_date_gmt',
-					'order' => 'ASC',
+					'order'   => 'ASC',
-					'status' => 'approve',
+					'status'  => 'approve',
 				);
 				if ( is_user_logged_in() ) {
 					$comment_args['include_unapproved'] = get_current_user_id();
 				} else {
-					$commenter = wp_get_current_commenter();
+					$unapproved_email = wp_get_unapproved_comment_author_email();
-					if ( $commenter['comment_author_email'] ) {
-						$comment_args['include_unapproved'] = $commenter['comment_author_email'];
+					if ( $unapproved_email ) {
+						$comment_args['include_unapproved'] = array( $unapproved_email );
 					}
 				}
 				$comments = get_comments( $comment_args );
 				} else {
 					$_comments = $comments;
 				}
 			}
-		// 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) )
+				if ( empty( $wp_query->comments_by_type ) ) {
-					$wp_query->comments_by_type = separate_comments($wp_query->comments);
+					$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[ $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
+					* When first page shows oldest comments, post permalink is the same as
-				 * the comment permalink.
+					* 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') )
+		if ( get_option( 'thread_comments' ) ) {
-			$r['max_depth'] = get_option('thread_comments_depth');
+			$r['max_depth'] = get_option( 'thread_comments_depth' );
-		else
+		} else {
 			$r['max_depth'] = -1;
+		}
 	}
 	if ( '' === $r['page'] ) {
-		if ( empty($overridden_cpage) ) {
+		if ( empty( $overridden_cpage ) ) {
-			$r['page'] = get_query_var('cpage');
+			$r['page'] = get_query_var( 'cpage' );
 		} else {
-			$threaded = ( -1 != $r['max_depth'] );
+			$threaded  = ( -1 != $r['max_depth'] );
-			$r['page'] = ( 'newest' == get_option('default_comments_page') ) ? get_comment_pages_count($_comments, $r['per_page'], $threaded) : 1;
+			$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']);
+	$r['page'] = intval( $r['page'] );
-	if ( 0 == $r['page'] && 0 != $r['per_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 );
 	if ( empty( $r['walker'] ) ) {
 		$walker = new Walker_Comment;
 *     @type string $format               The comment form format. Default 'xhtml'. Accepts 'xhtml', 'html5'.
 * }
 * @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 ) ) {
 		/**
 		 * Fires after the comment form if comments are closed.
 		do_action( 'comment_form_comments_closed' );
 		return;
 	}
-	$commenter = wp_get_current_commenter();
+	$commenter     = wp_get_current_commenter();
-	$user = wp_get_current_user();
+	$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(
+	$fields   = array(
-		'author'  => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
+		'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
 					 '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $html_req . ' /></p>',
-		'email'   => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
+		'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
 					 '<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $html_req . ' /></p>',
-		'url'     => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
+		'url'    => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
 					 '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
 	);
 	if ( has_action( 'set_comment_cookies', 'wp_set_comment_cookies' ) && get_option( 'show_comments_cookies_opt_in' ) ) {
 		$consent           = empty( $commenter['comment_author_email'] ) ? '' : ' checked="checked"';
 	/**
 	 * Filters the default comment form fields.
 	 *
 	 * @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'        => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label> <textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" required="required"></textarea></p>',
 		/** This filter is documented in wp-includes/link-template.php */
 		'must_log_in'          => '<p class="must-log-in">' . sprintf(
-		                              /* translators: %s: login URL */
+			/* translators: %s: login URL */
-		                              __( 'You must be <a href="%s">logged in</a> to post a comment.' ),
+									__( 'You must be <a href="%s">logged in</a> to post a comment.' ),
-		                              wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
+			wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
-		                          ) . '</p>',
+		) . '</p>',
 		/** This filter is documented in wp-includes/link-template.php */
 		'logged_in_as'         => '<p class="logged-in-as">' . sprintf(
-		                              /* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
+			/* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
-		                              __( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
+									__( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
-		                              get_edit_user_link(),
+			get_edit_user_link(),
-		                              /* translators: %s: user name */
+			/* translators: %s: user name */
-		                              esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
+									esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
-		                              $user_identity,
+			$user_identity,
-		                              wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
+			wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
-		                          ) . '</p>',
+		) . '</p>',
-		'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">' . __( 'Your email address will not be published.' ) . '</span>'. ( $req ? $required_text : '' ) . '</p>',
+		'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">' . __( 'Your email address will not be published.' ) . '</span>' . ( $req ? $required_text : '' ) . '</p>',
 		'comment_notes_after'  => '',
 		'action'               => site_url( '/wp-comments-post.php' ),
 		'id_form'              => 'commentform',
 		'id_submit'            => 'submit',
 		'class_form'           => 'comment-form',
 		echo $args['cancel_reply_after'];
 		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.
 			 *
 			 * @since 3.0.0
 			 */
 			do_action( 'comment_form_must_log_in_after' );
-		else : ?>
+		else :
+			?>
 			<form action="<?php echo esc_url( $args['action'] ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="<?php echo esc_attr( $args['class_form'] ); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
 				<?php
 				/**
 				 * Fires at the top of the comment form, inside the form tag.
 				 *
 				 * Filters the submit button for the comment form to display.
 				 *
 				 * @since 4.2.0
 				 *
 				 * @param string $submit_button HTML markup for the submit button.
-				 * @param array  $args          Arguments passed to `comment_form()`.
+				 * @param array  $args          Arguments passed to comment_form().
 				 */
 				$submit_button = apply_filters( 'comment_form_submit_button', $submit_button, $args );
 				$submit_field = sprintf(
 					$args['submit_field'],

changeset 9	177826044cd9
parent 7	cf61fcea0001
child 16	a86126ab1dd4