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

equal deleted inserted replaced

-:490d5cc509ed
+:cf61fcea0001
 *
 * If the comment has an empty comment_author field, then 'Anonymous' person is
 * assumed.
 *
 * @since 1.5.0
-*
+* @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
-* @param int $comment_ID Optional. The ID of the comment for which to retrieve the author. Default current comment.
+*
+* @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to retrieve the author.
+*									 Default current comment.
 * @return string The comment author
 */
 function get_comment_author( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
 	} else {
 		$author = $comment->comment_author;
 	}
 	/**
-	 * Filter the returned comment author name.
+	 * Filters the returned comment author name.
 	 *
 	 * @since 1.5.0
 	 * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added.
 	 *
+	 * @param string     $author     The comment author's username.
+	 * @param int        $comment_ID The comment ID.
+	 * @param WP_Comment $comment    The comment object.
+	 */
+	return apply_filters( 'get_comment_author', $author, $comment->comment_ID, $comment );
+}
+/**
+* Displays the author of the current comment.
+*
+* @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.
+*/
+function comment_author( $comment_ID = 0 ) {
+	$comment = get_comment( $comment_ID );
+	$author  = get_comment_author( $comment );
+	/**
+	 * Filters the comment author's name for display.
+	 *
+	 * @since 1.2.0
+	 * @since 4.1.0 The `$comment_ID` parameter was added.
+	 *
 	 * @param string $author     The comment author's username.
 	 * @param int    $comment_ID The comment ID.
-	 * @param object $comment    The comment object.
+	 */
-	 */
+	echo apply_filters( 'comment_author', $author, $comment->comment_ID );
-	return apply_filters( 'get_comment_author', $author, $comment_ID, $comment );
+}
-}
+/**
-/**
+* Retrieve the email of the author of the current comment.
-* Displays the author of the current 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.
+* @return string The current comment author's email
+*/
+function get_comment_author_email( $comment_ID = 0 ) {
+	$comment = get_comment( $comment_ID );
+	/**
+	 * Filters the comment author's returned email address.
+	 *
+	 * @since 1.5.0
+	 * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added.
+	 *
+	 * @param string     $comment_author_email The comment author's email address.
+	 * @param int        $comment_ID           The comment ID.
+	 * @param WP_Comment $comment              The comment object.
+	 */
+	return apply_filters( 'get_comment_author_email', $comment->comment_author_email, $comment->comment_ID, $comment );
+}
+/**
+* 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
+* 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 $comment_ID Optional. The ID of the comment for which to print the author. Default current comment.
+*
-*/
+* @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's email.
-function comment_author( $comment_ID = 0 ) {
+*									 Default current comment.
-	$author = get_comment_author( $comment_ID );
+*/
+function comment_author_email( $comment_ID = 0 ) {
-	/**
+	$comment      = get_comment( $comment_ID );
-	 * Filter the comment author's name for display.
+	$author_email = get_comment_author_email( $comment );
+	/**
+	 * Filters the comment author's email for display.
 	 *
 	 * @since 1.2.0
 	 * @since 4.1.0 The `$comment_ID` parameter was added.
 	 *
-	 * @param string $author     The comment author's username.
+	 * @param string $author_email The comment author's email address.
-	 * @param int    $comment_ID The comment ID.
+	 * @param int    $comment_ID   The comment ID.
 	 */
-	$author = apply_filters( 'comment_author', $author, $comment_ID );
+	echo apply_filters( 'author_email', $author_email, $comment->comment_ID );
-	echo $author;
+}
-}
+/**
-/**
+* Display the html email link to the author of the current comment.
-* Retrieve the email of the author of the current comment.
-*
-* @since 1.5.0
-*
-* @param int $comment_ID Optional. The ID of the comment for which to get the author's email. Default current comment.
-* @return string The current comment author's email
-*/
-function get_comment_author_email( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	/**
-	 * Filter the comment author's returned email address.
-	 *
-	 * @since 1.5.0
-	 * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added.
-	 *
-	 * @param string $comment_author_email The comment author's email address.
-	 * @param int    $comment_ID           The comment ID.
-	 * @param object $comment              The comment object.
-	 */
-	return apply_filters( 'get_comment_author_email', $comment->comment_author_email, $comment_ID, $comment );
-}
-/**
-* 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
-* their email address will not appear in raw form on the blog. Doing so will
+* 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.6.0 Added the `$comment` parameter.
-* @param int $comment_ID Optional. The ID of the comment for which to print the author's email. Default current comment.
+*
-*/
+* @param string         $linktext Optional. Text to display instead of the comment author's email address.
-function comment_author_email( $comment_ID = 0 ) {
+*                                 Default empty.
-	$author_email = get_comment_author_email( $comment_ID );
+* @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.
-	 * Filter the comment author's email for display.
+*/
-	 *
+function comment_author_email_link( $linktext = '', $before = '', $after = '', $comment = null ) {
-	 * @since 1.2.0
+	if ( $link = get_comment_author_email_link( $linktext, $before, $after, $comment ) ) {
-	 * @since 4.1.0 The `$comment_ID` parameter was added.
+		echo $link;
-	 *
+	}
-	 * @param string $author_email The comment author's email address.
+}
-	 * @param int    $comment_ID   The comment ID.
-	 */
+/**
-	echo apply_filters( 'author_email', $author_email, $comment_ID );
+* Return the html email link to the author of the current 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
-* their email address will not appear in raw form on the blog. Doing so will
+* 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
-*
-* @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.
-*/
-function comment_author_email_link( $linktext = '', $before = '', $after = '' ) {
-	if ( $link = get_comment_author_email_link( $linktext, $before, $after ) )
-		echo $link;
-}
-/**
-* 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
-* their email address will not appear in raw form on the blog. 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.
-*
-* @global object $comment The current Comment row object.
-*
 * @since 2.7.0
-*
+* @since 4.6.0 Added the `$comment` parameter.
-* @param string $linktext Optional. Text to display instead of the comment author's email address.
+*
-*                         Default empty.
+* @param string         $linktext Optional. Text to display instead of the comment author's email address.
-* @param string $before   Optional. Text or HTML to display before the email link. Default empty.
+*                                 Default empty.
-* @param string $after    Optional. Text or HTML to display after the email link. 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.
-function get_comment_author_email_link( $linktext = '', $before = '', $after = '' ) {
+* @param int|WP_Comment $comment  Optional. Comment ID or WP_Comment object. Default is the current comment.
-	global $comment;
+* @return string HTML markup for the comment author email link. By default, the email address is obfuscated
+*                via the {@see 'comment_email'} filter with antispambot().
-	/**
+*/
-	 * Filter the comment author's email for display.
+function get_comment_author_email_link( $linktext = '', $before = '', $after = '', $comment = null ) {
+	$comment = get_comment( $comment );
+	/**
+	 * Filters the comment author's email for display.
 	 *
 	 * Care should be taken to protect the email address and assure that email
 	 * harvesters do not capture your commenter's email address.
 	 *
 	 * @since 1.2.0
 	 * @since 4.1.0 The `$comment` parameter was added.
 	 *
-	 * @param string $comment_author_email The comment author's email address.
+	 * @param string     $comment_author_email The comment author's email address.
-	 * @param object $comment              The comment object.
+	 * @param WP_Comment $comment              The comment object.
 	 */
 	$email = apply_filters( 'comment_email', $comment->comment_author_email, $comment );
 	if ((!empty($email)) && ($email != '@')) {
 	$display = ($linktext != '') ? $linktext : $email;
 		$return  = $before;
-		$return .= "<a href='mailto:$email'>$display</a>";
+		$return .= sprintf( '<a href="%1$s">%2$s</a>', esc_url( 'mailto:' . $email ), esc_html( $display ) );
 	 	$return .= $after;
 		return $return;
 	} else {
 		return '';
 	}
 *
 * Both get_comment_author_url() and get_comment_author() rely on get_comment(),
 * which falls back to the global comment variable if the $comment_ID argument is empty.
 *
 * @since 1.5.0
-*
+* @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
-* @param int $comment_ID ID of the comment for which to get the author's link.
+*
-*                        Default current comment.
+* @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.
 * @return string The comment author name or HTML link for author's URL.
 */
 function get_comment_author_link( $comment_ID = 0 ) {
-	$url    = get_comment_author_url( $comment_ID );
+	$comment = get_comment( $comment_ID );
-	$author = get_comment_author( $comment_ID );
+	$url     = get_comment_author_url( $comment );
+	$author  = get_comment_author( $comment );
 	if ( empty( $url ) || 'http://' == $url )
 		$return = $author;
 	else
 		$return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
 	/**
-	 * Filter the comment author's link for display.
+	 * Filters the comment author's link for display.
 	 *
 	 * @since 1.5.0
 	 * @since 4.1.0 The `$author` and `$comment_ID` parameters were added.
 	 *
 	 * @param string $return     The HTML-formatted comment author link.
 	 *                           Empty for an invalid URL.
 	 * @param string $author     The comment author's username.
 	 * @param int    $comment_ID The comment ID.
 	 */
-	return apply_filters( 'get_comment_author_link', $return, $author, $comment_ID );
+	return apply_filters( 'get_comment_author_link', $return, $author, $comment->comment_ID );
 }
 /**
 * Display the html link to the url of the author of the current comment.
 *
 * @since 0.71
-*
+* @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
-* @see get_comment_author_link() Echoes result
+*
-*
+* @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's link.
-* @param int $comment_ID ID of the comment for which to print the author's
+*									 Default current comment.
-*                        link. Default current comment.
 */
 function comment_author_link( $comment_ID = 0 ) {
 	echo get_comment_author_link( $comment_ID );
 }
 /**
 * Retrieve the IP address of the author of the current comment.
 *
 * @since 1.5.0
-*
+* @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
-* @param int $comment_ID ID of the comment for which to get the author's IP
+*
-*                        address. Default current comment.
+* @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.
 * @return string Comment author's IP address.
 */
 function get_comment_author_IP( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
 	/**
-	 * Filter the comment author's returned IP address.
+	 * Filters the comment author's returned IP address.
 	 *
 	 * @since 1.5.0
 	 * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added.
 	 *
-	 * @param string $comment_author_IP The comment author's IP address.
+	 * @param string     $comment_author_IP The comment author's IP address.
-	 * @param int    $comment_ID        The comment ID.
+	 * @param int        $comment_ID        The comment ID.
-	 * @param object $comment           The comment object.
+	 * @param WP_Comment $comment           The comment object.
 	 */
-	return apply_filters( 'get_comment_author_IP', $comment->comment_author_IP, $comment_ID, $comment );
+	return apply_filters( 'get_comment_author_IP', $comment->comment_author_IP, $comment->comment_ID, $comment );
 }
 /**
 * Display the IP address of the author of the current comment.
 *
 * @since 0.71
-*
+* @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
-* @param int $comment_ID ID of the comment for which to print the author's IP
+*
-*                        address. Default current comment.
+* @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.
 */
 function comment_author_IP( $comment_ID = 0 ) {
-	echo get_comment_author_IP( $comment_ID );
+	echo esc_html( get_comment_author_IP( $comment_ID ) );
 }
 /**
 * Retrieve the url of the author of the current comment.
 *
 * @since 1.5.0
-*
+* @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
-* @param int $comment_ID ID of the comment for which to get the author's URL.
+*
-*                        Default current comment.
+* @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's URL.
-* @return string
+*									 Default current comment.
+* @return string Comment author URL.
 */
 function get_comment_author_url( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
-	$url = ('http://' == $comment->comment_author_url) ? '' : $comment->comment_author_url;
+	$url = '';
-	$url = esc_url( $url, array('http', 'https') );
+	$id = 0;
+	if ( ! empty( $comment ) ) {
-	/**
+		$author_url = ( 'http://' == $comment->comment_author_url ) ? '' : $comment->comment_author_url;
-	 * Filter the comment author's URL.
+		$url = esc_url( $author_url, array( 'http', 'https' ) );
+		$id = $comment->comment_ID;
+	}
+	/**
+	 * Filters the comment author's URL.
 	 *
 	 * @since 1.5.0
 	 * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added.
 	 *
-	 * @param string $url        The comment author's URL.
+	 * @param string     $url        The comment author's URL.
-	 * @param int    $comment_ID The comment ID.
+	 * @param int        $comment_ID The comment ID.
-	 * @param object $comment    The comment object.
+	 * @param WP_Comment $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_author_url', $url, $comment_ID, $comment );
+	return apply_filters( 'get_comment_author_url', $url, $id, $comment );
 }
 /**
 * Display the url of the author of the current comment.
 *
 * @since 0.71
-*
+* @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
-* @param int $comment_ID ID of the comment for which to print the author's URL.
+*
-*                        Default current comment.
+* @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.
 */
 function comment_author_url( $comment_ID = 0 ) {
-	$author_url = get_comment_author_url( $comment_ID );
+	$comment    = get_comment( $comment_ID );
+	$author_url = get_comment_author_url( $comment );
-	/**
-	 * Filter the comment author's URL for display.
+	/**
+	 * Filters the comment author's URL for display.
 	 *
 	 * @since 1.2.0
 	 * @since 4.1.0 The `$comment_ID` parameter was added.
 	 *
 	 * @param string $author_url The comment author's URL.
 	 * @param int    $comment_ID The comment ID.
 	 */
-	echo apply_filters( 'comment_url', $author_url, $comment_ID );
+	echo apply_filters( 'comment_url', $author_url, $comment->comment_ID );
 }
 /**
 * Retrieves the HTML link of the url of the author of the current comment.
 *
 *
 * Encapsulate the HTML link between the $before and $after. So it will appear
 * in the order of $before, link, and finally $after.
 *
 * @since 1.5.0
-*
+* @since 4.6.0 Added the `$comment` parameter.
-* @param string $linktext Optional. The text to display instead of the comment
+*
-*                         author's email address. Default empty.
+* @param string         $linktext Optional. The text to display instead of the comment
-* @param string $before   Optional. The text or HTML to display before the email link.
+*                                 author's email address. Default empty.
-*                         Default empty.
+* @param string         $before   Optional. The text or HTML to display before the email link.
-* @param string $after    Optional. The text or HTML to display after the email link.
+*                                 Default empty.
-*                         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.
 * @return string The HTML link between the $before and $after parameters.
 */
-function get_comment_author_url_link( $linktext = '', $before = '', $after = '' ) {
+function get_comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
-	$url = get_comment_author_url();
+	$url = get_comment_author_url( $comment );
 	$display = ($linktext != '') ? $linktext : $url;
 	$display = str_replace( 'http://www.', '', $display );
 	$display = str_replace( 'http://', '', $display );
 	if ( '/' == substr($display, -1) ) {
 	}
 	$return = "$before<a href='$url' rel='external'>$display</a>$after";
 	/**
-	 * Filter the comment author's returned URL link.
+	 * Filters the comment author's returned URL link.
 	 *
 	 * @since 1.5.0
 	 *
 	 * @param string $return The HTML-formatted comment author URL link.
 	 */
 /**
 * Displays the HTML link of the url of the author of the current comment.
 *
 * @since 0.71
-*
+* @since 4.6.0 Added the `$comment` parameter.
-* @param string $linktext Optional. Text to display instead of the comment author's
+*
-*                         email address. Default empty.
+* @param string         $linktext Optional. Text to display instead of the comment author's
-* @param string $before   Optional. Text or HTML to display before the email link.
+*                                 email address. Default empty.
-*                         Default empty.
+* @param string         $before   Optional. Text or HTML to display before the email link.
-* @param string $after    Optional. Text or HTML to display after the email link.
+*                                 Default empty.
-*                         Default empty.
+* @param string         $after    Optional. Text or HTML to display after the email link.
-*/
+*                                 Default empty.
-function comment_author_url_link( $linktext = '', $before = '', $after = '' ) {
+* @param int|WP_Comment $comment  Optional. Comment ID or WP_Comment object.
-	echo get_comment_author_url_link( $linktext, $before, $after );
+*                                 Default is the current comment.
+*/
+function comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
+	echo get_comment_author_url_link( $linktext, $before, $after, $comment );
 }
 /**
 * Generates semantic classes for each comment element.
 *
 * @since 2.7.0
-*
+* @since 4.4.0 Added the ability for `$comment` to also accept a WP_Comment object.
-* @param string|array $class      Optional. One or more classes to add to the class list.
+*
+* @param string|array   $class    Optional. One or more classes to add to the class list.
 *                                 Default empty.
-* @param int          $comment_id Comment ID. Default current comment.
+* @param int|WP_Comment $comment  Comment ID or WP_Comment object. Default current comment.
-* @param int|WP_Post  $post_id    Post ID or WP_Post object. Default current post.
+* @param int|WP_Post    $post_id  Post ID or WP_Post object. Default current post.
-* @param bool         $echo       Optional. Whether to cho or return the output.
+* @param bool           $echo     Optional. Whether to cho or return the output.
 *                                 Default true.
-*/
+* @return string If `$echo` is false, the class will be returned. Void otherwise.
-function comment_class( $class = '', $comment_id = null, $post_id = null, $echo = true ) {
+*/
+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_id, $post_id ) ) . '"';
+	$class = 'class="' . join( ' ', get_comment_class( $class, $comment, $post_id ) ) . '"';
 	if ( $echo)
 		echo $class;
 	else
 		return $class;
 }
 /**
 * Returns the classes for the comment div as an array.
 *
 * @since 2.7.0
-*
+* @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
-* @param string|array $class      Optional. One or more classes to add to the class list. Default empty.
+*
-* @param int          $comment_id Comment ID. Default current comment.
+* @global int $comment_alt
-* @param int|WP_Post  $post_id    Post ID or WP_Post object. Default current post.
+* @global int $comment_depth
+* @global int $comment_thread_alt
+*
+* @param string|array   $class      Optional. One or more classes to add to the class list. Default empty.
+* @param int|WP_Comment $comment_id Comment ID or WP_Comment object. Default current comment.
+* @param int|WP_Post    $post_id    Post ID or WP_Post object. Default current post.
 * @return array An array of classes.
 */
 function get_comment_class( $class = '', $comment_id = null, $post_id = null ) {
 	global $comment_alt, $comment_depth, $comment_thread_alt;
-	$comment = get_comment($comment_id);
 	$classes = array();
+	$comment = get_comment( $comment_id );
+	if ( ! $comment ) {
+		return $classes;
+	}
 	// Get the comment type (comment, trackback),
 	$classes[] = ( empty( $comment->comment_type ) ) ? 'comment' : $comment->comment_type;
 	// Add classes for comment authors that are registered users.
 	}
 	$classes = array_map('esc_attr', $classes);
 	/**
-	 * Filter the returned CSS classes for the current comment.
+	 * Filters the returned CSS classes for the current comment.
 	 *
 	 * @since 2.7.0
 	 *
 	 * @param array       $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 object   	  $comment    The comment
+	 * @param WP_Comment  $comment    The comment object.
 	 * @param int|WP_Post $post_id    The post ID or WP_Post object.
 	 */
-	return apply_filters( 'comment_class', $classes, $class, $comment_id, $comment, $post_id );
+	return apply_filters( 'comment_class', $classes, $class, $comment->comment_ID, $comment, $post_id );
 }
 /**
 * Retrieve the comment date of the current comment.
 *
 * @since 1.5.0
-*
+* @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
-* @param string $d          Optional. The format of the date. Default user's setting.
+*
-* @param int    $comment_ID ID of the comment for which to get the date. Default current comment.
+* @param string          $d          Optional. The format of the date. Default user's setting.
+* @param int|WP_Comment  $comment_ID WP_Comment or ID of the comment for which to get the date.
+*                                    Default current comment.
 * @return string The comment's date.
 */
 function get_comment_date( $d = '', $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
 	if ( '' == $d )
 		$date = mysql2date(get_option('date_format'), $comment->comment_date);
 	else
 		$date = mysql2date($d, $comment->comment_date);
 	/**
-	 * Filter the returned comment date.
+	 * Filters the returned comment date.
 	 *
 	 * @since 1.5.0
 	 *
 	 * @param string|int $date    Formatted date string or Unix timestamp.
 	 * @param string     $d       The format of the date.
-	 * @param object     $comment The comment object.
+	 * @param WP_Comment $comment The comment object.
 	 */
 	return apply_filters( 'get_comment_date', $date, $d, $comment );
 }
 /**
 * Display the comment date of the current comment.
 *
 * @since 0.71
-*
+* @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
-* @param string $d          Optional. The format of the date. Default user's settings.
+*
-* @param int    $comment_ID ID of the comment for which to print the date. Default current comment.
+* @param string         $d          Optional. The format of the date. Default user's settings.
+* @param int|WP_Comment $comment_ID WP_Comment or ID of the comment for which to print the date.
+*                                   Default current comment.
 */
 function comment_date( $d = '', $comment_ID = 0 ) {
 	echo get_comment_date( $d, $comment_ID );
 }
 * Will cut each word and only output the first 20 words with '&hellip;' at the end.
 * If the word count is less than 20, then no truncating is done and no '&hellip;'
 * will appear.
 *
 * @since 1.5.0
-*
+* @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
-* @param int $comment_ID ID of the comment for which to get the excerpt.
+*
-*                        Default current comment.
+* @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_text = strip_tags($comment->comment_content);
+	$comment_text = strip_tags( str_replace( array( "\n", "\r" ), ' ', $comment->comment_content ) );
-	$blah = explode(' ', $comment_text);
+	$words = explode( ' ', $comment_text );
-	if (count($blah) > 20) {
+	/**
-		$k = 20;
+	 * Filters the amount of words used in the comment excerpt.
-		$use_dotdotdot = 1;
+	 *
-	} else {
+	 * @since 4.4.0
-		$k = count($blah);
+	 *
-		$use_dotdotdot = 0;
+	 * @param int $comment_excerpt_length The amount of words you want to display in the comment excerpt.
-	}
+	 */
+	$comment_excerpt_length = apply_filters( 'comment_excerpt_length', 20 );
-	$excerpt = '';
-	for ($i=0; $i<$k; $i++) {
+	$use_ellipsis = count( $words ) > $comment_excerpt_length;
-		$excerpt .= $blah[$i] . ' ';
+	if ( $use_ellipsis ) {
-	}
+		$words = array_slice( $words, 0, $comment_excerpt_length );
-	$excerpt .= ($use_dotdotdot) ? '&hellip;' : '';
+	}
-	/**
+	$excerpt = trim( join( ' ', $words ) );
-	 * Filter the retrieved comment excerpt.
+	if ( $use_ellipsis ) {
+		$excerpt .= '&hellip;';
+	}
+	/**
+	 * Filters the retrieved comment excerpt.
 	 *
 	 * @since 1.5.0
 	 * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added.
 	 *
-	 * @param string $excerpt    The comment excerpt text.
+	 * @param string     $excerpt    The comment excerpt text.
-	 * @param int    $comment_ID The comment ID.
+	 * @param int        $comment_ID The comment ID.
-	 * @param object $comment    The comment object.
+	 * @param WP_Comment $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_excerpt', $excerpt, $comment_ID, $comment );
+	return apply_filters( 'get_comment_excerpt', $excerpt, $comment->comment_ID, $comment );
 }
 /**
 * Display the excerpt of the current comment.
 *
 * @since 1.2.0
-*
+* @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
-* @param int $comment_ID ID of the comment for which to print the excerpt.
+*
-*                        Default current comment.
+* @param int|WP_Comment $comment_ID  WP_Comment or ID of the comment for which to print the excerpt.
+*                                    Default current comment.
 */
 function comment_excerpt( $comment_ID = 0 ) {
-	$comment_excerpt = get_comment_excerpt($comment_ID);
+	$comment         = get_comment( $comment_ID );
+	$comment_excerpt = get_comment_excerpt( $comment );
-	/**
-	 * Filter the comment excerpt for display.
+	/**
+	 * Filters the comment excerpt for display.
 	 *
 	 * @since 1.2.0
 	 * @since 4.1.0 The `$comment_ID` parameter was added.
 	 *
 	 * @param string $comment_excerpt The comment excerpt text.
 	 * @param int    $comment_ID      The comment ID.
 	 */
-	echo apply_filters( 'comment_excerpt', $comment_excerpt, $comment_ID );
+	echo apply_filters( 'comment_excerpt', $comment_excerpt, $comment->comment_ID );
 }
 /**
 * Retrieve the comment id of the current comment.
 *
 * @since 1.5.0
 *
 * @return int The comment ID.
 */
 function get_comment_ID() {
-	global $comment;
+	$comment = get_comment();
 	/**
-	 * Filter the returned comment ID.
+	 * Filters the returned comment ID.
 	 *
 	 * @since 1.5.0
 	 * @since 4.1.0 The `$comment_ID` parameter was added.
 	 *
-	 * @param int    $comment_ID The current comment ID.
+	 * @param int        $comment_ID The current comment ID.
-	 * @param object $comment    The comment object.
+	 * @param WP_Comment $comment    The comment object.
 	 */
 	return apply_filters( 'get_comment_ID', $comment->comment_ID, $comment );
 }
 /**
 /**
 * Retrieve the link to a given comment.
 *
 * @since 1.5.0
+* @since 4.4.0 Added the ability for `$comment` to also accept a WP_Comment object. Added `$cpage` argument.
 *
 * @see get_page_of_comment()
 *
-* @param mixed $comment Comment to retrieve. Default current comment.
+* @global WP_Rewrite $wp_rewrite
-* @param array $args    Optional. An array of arguments to override the defaults.
+* @global bool       $in_comment_loop
+*
+* @param WP_Comment|int|null $comment Comment to retrieve. Default current comment.
+* @param array               $args {
+*     An array of optional arguments to override the defaults.
+*
+*     @type string     $type      Passed to get_page_of_comment().
+*     @type int        $page      Current page of comments, for calculating comment pagination.
+*     @type int        $per_page  Per-page value for comment pagination.
+*     @type int        $max_depth Passed to get_page_of_comment().
+*     @type int|string $cpage     Value to use for the comment's "comment-page" or "cpage" value.
+*                                 If provided, this value overrides any value calculated from `$page`
+*                                 and `$per_page`.
+* }
 * @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);
-	// Backwards compat
+	// Back-compat.
 	if ( ! is_array( $args ) ) {
 		$args = array( 'page' => $args );
 	}
-	$defaults = array( 'type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '' );
+	$defaults = array(
+		'type'      => 'all',
+		'page'      => '',
+		'per_page'  => '',
+		'max_depth' => '',
+		'cpage'     => null,
+	);
 	$args = wp_parse_args( $args, $defaults );
-	if ( '' === $args['per_page'] && get_option('page_comments') )
+	$link = get_permalink( $comment->comment_post_ID );
-		$args['per_page'] = get_option('comments_per_page');
+	// The 'cpage' param takes precedence.
-	if ( empty($args['per_page']) ) {
+	if ( ! is_null( $args['cpage'] ) ) {
-		$args['per_page'] = 0;
+		$cpage = $args['cpage'];
-		$args['page'] = 0;
-	}
+	// No 'cpage' is provided, so we calculate one.
-	if ( $args['per_page'] ) {
-		if ( '' == $args['page'] )
-			$args['page'] = ( !empty($in_comment_loop) ) ? get_query_var('cpage') : get_page_of_comment( $comment->comment_ID, $args );
-		if ( $wp_rewrite->using_permalinks() )
-			$link = user_trailingslashit( trailingslashit( get_permalink( $comment->comment_post_ID ) ) . $wp_rewrite->comments_pagination_base . '-' . $args['page'], 'comment' );
-		else
-			$link = add_query_arg( 'cpage', $args['page'], get_permalink( $comment->comment_post_ID ) );
 	} else {
-		$link = get_permalink( $comment->comment_post_ID );
+		if ( '' === $args['per_page'] && get_option( 'page_comments' ) ) {
+			$args['per_page'] = get_option('comments_per_page');
+		}
+		if ( empty( $args['per_page'] ) ) {
+			$args['per_page'] = 0;
+			$args['page'] = 0;
+		}
+		$cpage = $args['page'];
+		if ( '' == $cpage ) {
+			if ( ! empty( $in_comment_loop ) ) {
+				$cpage = get_query_var( 'cpage' );
+			} else {
+				// Requires a database hit, so we only do it when we can't figure out from context.
+				$cpage = get_page_of_comment( $comment->comment_ID, $args );
+			}
+		}
+		/*
+		 * If the default page displays the oldest comments, the permalinks for comments on the default page
+		 * do not need a 'cpage' query var.
+		 */
+		if ( 'oldest' === get_option( 'default_comments_page' ) && 1 === $cpage ) {
+			$cpage = '';
+		}
+	}
+	if ( $cpage && get_option( 'page_comments' ) ) {
+		if ( $wp_rewrite->using_permalinks() ) {
+			if ( $cpage ) {
+				$link = trailingslashit( $link ) . $wp_rewrite->comments_pagination_base . '-' . $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' );
 	}
 	$link = $link . '#comment-' . $comment->comment_ID;
-	/**
-	 * Filter the returned single comment permalink.
+	/**
+	 * Filters the returned single comment permalink.
 	 *
 	 * @since 2.8.0
+	 * @since 4.4.0 Added the `$cpage` parameter.
 	 *
 	 * @see get_page_of_comment()
 	 *
-	 * @param string $link    The comment permalink with '#comment-$id' appended.
+	 * @param string     $link    The comment permalink with '#comment-$id' appended.
-	 * @param object $comment The current comment object.
+	 * @param WP_Comment $comment The current comment object.
-	 * @param array  $args    An array of arguments to override the defaults.
+	 * @param array      $args    An array of arguments to override the defaults.
-	 */
+	 * @param int        $cpage   The calculated 'cpage' value.
-	return apply_filters( 'get_comment_link', $link, $comment, $args );
+	 */
-}
+	return apply_filters( 'get_comment_link', $link, $comment, $args, $cpage );
+}
-/**
-* Retrieve the link to the current post comments.
+/**
+* Retrieves the link to the current post comments.
 *
 * @since 1.5.0
 *
 * @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 ) {
-	$comments_link = get_permalink( $post_id ) . '#comments';
+	$hash = get_comments_number( $post_id ) ? '#comments' : '#respond';
-	/**
+	$comments_link = get_permalink( $post_id ) . $hash;
-	 * Filter the returned post comments permalink.
+	/**
+	 * Filters the returned post comments permalink.
 	 *
 	 * @since 3.6.0
 	 *
 	 * @param string      $comments_link Post comments permalink with '#comments' appended.
 	 * @param int|WP_Post $post_id       Post ID or WP_Post object.
 */
 function comments_link( $deprecated = '', $deprecated_2 = '' ) {
 	if ( !empty( $deprecated ) )
 		_deprecated_argument( __FUNCTION__, '0.72' );
 	if ( !empty( $deprecated_2 ) )
-		_deprecated_argument( __FUNCTION__, '1.3' );
+		_deprecated_argument( __FUNCTION__, '1.3.0' );
 	echo esc_url( get_comments_link() );
 }
 /**
-* Retrieve the amount of comments a post has.
+* Retrieves the amount of comments a post has.
 *
 * @since 1.5.0
 *
-* @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+* @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is the global `$post`.
-* @return int The number of comments a post has.
+* @return string|int If the post exists, a numeric string representing the number of comments
+*                    the post has, otherwise 0.
 */
 function get_comments_number( $post_id = 0 ) {
 	$post = get_post( $post_id );
 	if ( ! $post ) {
 		$count = $post->comment_count;
 		$post_id = $post->ID;
 	}
 	/**
-	 * Filter the returned comment count for a post.
+	 * Filters the returned comment count for a post.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param int $count   Number of comments a post has.
+	 * @param string|int $count   A string representing the number of comments a post has, otherwise 0.
-	 * @param int $post_id Post ID.
+	 * @param int        $post_id Post ID.
 	 */
 	return apply_filters( 'get_comments_number', $count, $post_id );
 }
 /**
 * @param string $more       Optional. Text for more than one comment. Default false.
 * @param string $deprecated Not used.
 */
 function comments_number( $zero = false, $one = false, $more = false, $deprecated = '' ) {
 	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '1.3' );
+		_deprecated_argument( __FUNCTION__, '1.3.0' );
 	}
 	echo get_comments_number_text( $zero, $one, $more );
 }
 /**
 */
 function get_comments_number_text( $zero = false, $one = false, $more = false ) {
 	$number = get_comments_number();
 	if ( $number > 1 ) {
-		$output = str_replace( '%', number_format_i18n( $number ), ( false === $more ) ? __( '% Comments' ) : $more );
+		if ( false === $more ) {
+			/* translators: %s: number of comments */
+			$output = sprintf( _n( '%s Comment', '%s Comments', $number ), number_format_i18n( $number ) );
+		} else {
+			// % Comments
+			/* translators: If comment number in your language requires declension,
+			 * translate this to 'on'. Do not translate into your own language.
+			 */
+			if ( 'on' === _x( 'off', 'Comment number declension: on or off' ) ) {
+				$text = preg_replace( '#<span class="screen-reader-text">.+?</span>#', '', $more );
+				$text = preg_replace( '/&.+?;/', '', $text ); // Kill entities
+				$text = trim( strip_tags( $text ), '% ' );
+				// Replace '% Comments' with a proper plural form
+				if ( $text && ! preg_match( '/[0-9]+/', $text ) && false !== strpos( $more, '%' ) ) {
+					/* translators: %s: number of comments */
+					$new_text = _n( '%s Comment', '%s Comments', $number );
+					$new_text = trim( sprintf( $new_text, '' ) );
+					$more = str_replace( $text, $new_text, $more );
+					if ( false === strpos( $more, '%' ) ) {
+						$more = '% ' . $more;
+					}
+				}
+			}
+			$output = str_replace( '%', number_format_i18n( $number ), $more );
+		}
 	} elseif ( $number == 0 ) {
 		$output = ( false === $zero ) ? __( 'No Comments' ) : $zero;
 	} else { // must be one
 		$output = ( false === $one ) ? __( '1 Comment' ) : $one;
 	}
 	/**
-	 * Filter the comments count for display.
+	 * Filters the comments count for display.
 	 *
 	 * @since 1.5.0
 	 *
 	 * @see _n()
 	 *
 /**
 * Retrieve the text of the current comment.
 *
 * @since 1.5.0
+* @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
 *
 * @see Walker_Comment::comment()
 *
-* @param int   $comment_ID ID of the comment for which to get the text. Default current comment.
+* @param int|WP_Comment  $comment_ID WP_Comment or ID of the comment for which to get the text.
-* @param array $args       Optional. An array of arguments. Default empty.
+*                                    Default current comment.
+* @param array           $args       Optional. An array of arguments. Default empty.
 * @return string The comment content.
 */
 function get_comment_text( $comment_ID = 0, $args = array() ) {
 	$comment = get_comment( $comment_ID );
 	/**
-	 * Filter the text of a comment.
+	 * Filters the text of a comment.
 	 *
 	 * @since 1.5.0
 	 *
 	 * @see Walker_Comment::comment()
 	 *
-	 * @param string $comment_content Text of the comment.
+	 * @param string     $comment_content Text of the comment.
-	 * @param object $comment         The comment object.
+	 * @param WP_Comment $comment         The comment object.
-	 * @param array  $args            An array of arguments.
+	 * @param array      $args            An array of arguments.
 	 */
 	return apply_filters( 'get_comment_text', $comment->comment_content, $comment, $args );
 }
 /**
 * Display the text of the current comment.
 *
 * @since 0.71
+* @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
 *
 * @see Walker_Comment::comment()
 *
-* @param int   $comment_ID ID of the comment for which to print the text. Default 0.
+* @param int|WP_Comment  $comment_ID WP_Comment or ID of the comment for which to print the text.
-* @param array $args       Optional. An array of arguments. Default empty array. Default empty.
+*                                    Default current comment.
+* @param array           $args       Optional. An array of arguments. Default empty array. Default empty.
 */
 function comment_text( $comment_ID = 0, $args = array() ) {
 	$comment = get_comment( $comment_ID );
-	$comment_text = get_comment_text( $comment_ID , $args );
+	$comment_text = get_comment_text( $comment, $args );
 	/**
-	 * Filter the text of a comment to be displayed.
+	 * Filters the text of a comment to be displayed.
 	 *
 	 * @since 1.2.0
 	 *
 	 * @see Walker_Comment::comment()
 	 *
-	 * @param string $comment_text Text of the current comment.
+	 * @param string          $comment_text Text of the current comment.
-	 * @param object $comment      The comment object.
+	 * @param WP_Comment|null $comment      The comment object.
-	 * @param array  $args         An array of arguments.
+	 * @param array           $args         An array of arguments.
 	 */
 	echo apply_filters( 'comment_text', $comment_text, $comment, $args );
 }
 /**
 * @param bool   $translate Optional. Whether to translate the time (for use in feeds).
 *                          Default true.
 * @return string The formatted time.
 */
 function get_comment_time( $d = '', $gmt = false, $translate = true ) {
-	global $comment;
+	$comment = get_comment();
 	$comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;
 	if ( '' == $d )
 		$date = mysql2date(get_option('time_format'), $comment_date, $translate);
 	else
 		$date = mysql2date($d, $comment_date, $translate);
 	/**
-	 * Filter the returned comment time.
+	 * Filters the returned comment time.
 	 *
 	 * @since 1.5.0
 	 *
 	 * @param string|int $date      The comment time, formatted as a date string or Unix timestamp.
 	 * @param string     $d         Date format.
 	 * @param bool       $gmt       Whether the GMT date is in use.
 	 * @param bool       $translate Whether the time is translated.
-	 * @param object     $comment   The comment object.
+	 * @param WP_Comment $comment   The comment object.
 	 */
 	return apply_filters( 'get_comment_time', $date, $d, $gmt, $translate, $comment );
 }
 /**
 /**
 * Retrieve the comment type of the current comment.
 *
 * @since 1.5.0
-*
+* @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
-* @param int $comment_ID ID of the comment for which to get the type. Default current comment.
+*
+* @param int|WP_Comment $comment_ID Optional. WP_Comment or ID of the comment for which to get the type.
+*                                   Default current comment.
 * @return string The comment type.
 */
 function get_comment_type( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
 	if ( '' == $comment->comment_type )
 		$comment->comment_type = 'comment';
 	/**
-	 * Filter the returned comment type.
+	 * 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 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 object $comment      The comment object.
+	 * @param WP_Comment $comment      The comment object.
 	 */
-	return apply_filters( 'get_comment_type', $comment->comment_type, $comment_ID, $comment );
+	return apply_filters( 'get_comment_type', $comment->comment_type, $comment->comment_ID, $comment );
 }
 /**
 * Display the comment type of the current comment.
 *
 		$tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
 	else
 		$tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
 	/**
-	 * Filter the returned trackback URL.
+	 * Filters the returned trackback URL.
 	 *
 	 * @since 2.2.0
 	 *
 	 * @param string $tb_url The trackback URL.
 	 */
 * @param bool $deprecated_echo Not used.
 * @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 ( $deprecated_echo !== true )
+	if ( true !== $deprecated_echo ) {
-		_deprecated_argument( __FUNCTION__, '2.5', __('Use <code>get_trackback_url()</code> instead if you do not want the value echoed.') );
+		_deprecated_argument( __FUNCTION__, '2.5.0',
-	if ( $deprecated_echo )
+			/* translators: %s: get_trackback_url() */
+			sprintf( __( 'Use %s instead if you do not want the value echoed.' ),
+				'<code>get_trackback_url()</code>'
+			)
+		);
+	}
+	if ( $deprecated_echo ) {
 		echo get_trackback_url();
-	else
+	} else {
 		return get_trackback_url();
+	}
 }
 /**
 * Generate and display the RDF for the trackback information of current post.
 *
 *
 * @param int $deprecated Not used (Was $timezone = 0).
 */
 function trackback_rdf( $deprecated = '' ) {
 	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '2.5' );
+		_deprecated_argument( __FUNCTION__, '2.5.0' );
 	}
 	if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && false !== stripos( $_SERVER['HTTP_USER_AGENT'], 'W3C_Validator' ) ) {
 		return;
 	}
 */
 function comments_open( $post_id = null ) {
 	$_post = get_post($post_id);
+	$post_id = $_post ? $_post->ID : 0;
 	$open = ( 'open' == $_post->comment_status );
 	/**
-	 * Filter whether the current post is open for comments.
+	 * Filters whether the current post is open for comments.
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param bool        $open    Whether the current post is open for comments.
+	 * @param bool $open    Whether the current post is open for comments.
-	 * @param int|WP_Post $post_id The post ID or WP_Post object.
+	 * @param int  $post_id The post ID.
 	 */
 	return apply_filters( 'comments_open', $open, $post_id );
 }
 /**
 */
 function pings_open( $post_id = null ) {
 	$_post = get_post($post_id);
+	$post_id = $_post ? $_post->ID : 0;
 	$open = ( 'open' == $_post->ping_status );
 	/**
-	 * Filter whether the current post is open for pings.
+	 * Filters whether the current post is open for pings.
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param bool        $open    Whether the current post is open for pings.
+	 * @param bool $open    Whether the current post is open for pings.
-	 * @param int|WP_Post $post_id The post ID or WP_Post object.
+	 * @param int  $post_id The post ID.
 	 */
 	return apply_filters( 'pings_open', $open, $post_id );
 }
 /**
 *
 * Will not display the comments template if not on single post or page, or if
 * the post does not have comments.
 *
 * Uses the WordPress database object to query for the comments. The comments
-* are passed through the 'comments_array' filter hook with the list of comments
+* are passed through the {@see 'comments_array'} filter hook with the list of comments
 * and the post ID respectively.
 *
-* The $file path is passed through a filter hook called, 'comments_template'
+* The `$file` path is passed through a filter hook called {@see 'comments_template'},
 * which includes the TEMPLATEPATH and $file combined. Tries the $filtered path
 * first and if it fails it will require the default comment template from the
 * default theme. If either does not exist, then the WordPress process will be
 * halted. It is advised for that reason, that the default theme is not deleted.
 *
-* @todo Document globals
+* Will not try to get the comments if the post has none.
-* @uses $withcomments Will not try to get the comments if the post has none.
 *
 * @since 1.5.0
+*
+* @global WP_Query   $wp_query
+* @global WP_Post    $post
+* @global wpdb       $wpdb
+* @global int        $id
+* @global WP_Comment $comment
+* @global string     $user_login
+* @global int        $user_ID
+* @global string     $user_identity
+* @global bool       $overridden_cpage
+* @global bool       $withcomments
 *
 * @param string $file              Optional. The file to load. Default '/comments.php'.
 * @param bool   $separate_comments Optional. Whether to separate the comments by comment type.
 *                                  Default false.
-* @return null Returns null if no comments appear.
 */
 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) )
 	 * The url of the current comment author escaped for use in attributes.
 	 */
 	$comment_author_url = esc_url($commenter['comment_author_url']);
 	$comment_args = array(
-		'order'   => 'ASC',
 		'orderby' => 'comment_date_gmt',
+		'order' => 'ASC',
 		'status'  => 'approve',
 		'post_id' => $post->ID,
+		'no_found_rows' => false,
+		'update_comment_meta_cache' => false, // We lazy-load comment meta for performance.
 	);
+	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 ) ) {
 		$comment_args['include_unapproved'] = array( $comment_author_email );
 	}
-	$comments = get_comments( $comment_args );
+	$per_page = 0;
+	if ( get_option( 'page_comments' ) ) {
-	/**
+		$per_page = (int) get_query_var( 'comments_per_page' );
-	 * Filter the comments array.
+		if ( 0 === $per_page ) {
+			$per_page = (int) get_option( 'comments_per_page' );
+		}
+		$comment_args['number'] = $per_page;
+		$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;
+		} else {
+			// If fetching the first page of 'newest', we need a top-level comment count.
+			$top_level_query = new WP_Comment_Query();
+			$top_level_args  = array(
+				'count'   => true,
+				'orderby' => false,
+				'post_id' => $post->ID,
+				'status'  => 'approve',
+			);
+			if ( $comment_args['hierarchical'] ) {
+				$top_level_args['parent'] = 0;
+			}
+			if ( isset( $comment_args['include_unapproved'] ) ) {
+				$top_level_args['include_unapproved'] = $comment_args['include_unapproved'];
+			}
+			$top_level_count = $top_level_query->query( $top_level_args );
+			$comment_args['offset'] = ( ceil( $top_level_count / $per_page ) - 1 ) * $per_page;
+		}
+	}
+	/**
+	 * Filters the arguments used to query comments in comments_template().
+	 *
+	 * @since 4.5.0
+	 *
+	 * @see WP_Comment_Query::__construct()
+	 *
+	 * @param array $comment_args {
+	 *     Array of WP_Comment_Query arguments.
+	 *
+	 *     @type string|array $orderby                   Field(s) to order by.
+	 *     @type string       $order                     Order of results. Accepts 'ASC' or 'DESC'.
+	 *     @type string       $status                    Comment status.
+	 *     @type array        $include_unapproved        Array of IDs or email addresses whose unapproved comments
+	 *                                                   will be included in results.
+	 *     @type int          $post_id                   ID of the post.
+	 *     @type bool         $no_found_rows             Whether to refrain from querying for found rows.
+	 *     @type bool         $update_comment_meta_cache Whether to prime cache for comment meta.
+	 *     @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_query = new WP_Comment_Query( $comment_args );
+	$_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(
+				'format' => 'flat',
+				'status' => $comment_args['status'],
+				'orderby' => $comment_args['orderby']
+			) );
+			foreach ( $comment_children as $comment_child ) {
+				$comments_flat[] = $comment_child;
+			}
+		}
+	} else {
+		$comments_flat = $_comments;
+	}
+	/**
+	 * Filters the comments array.
 	 *
 	 * @since 2.1.0
 	 *
 	 * @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, $post->ID );
+	$wp_query->comments = apply_filters( 'comments_array', $comments_flat, $post->ID );
 	$comments = &$wp_query->comments;
 	$wp_query->comment_count = count($wp_query->comments);
-	update_comment_cache($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);
 		$comments_by_type = &$wp_query->comments_by_type;
+	} else {
+		$wp_query->comments_by_type = array();
 	}
 	$overridden_cpage = false;
-	if ( '' == get_query_var('cpage') && get_option('page_comments') ) {
+	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 );
 		$overridden_cpage = true;
 	}
 	if ( !defined('COMMENTS_TEMPLATE') )
 		define('COMMENTS_TEMPLATE', true);
 	$theme_template = STYLESHEETPATH . $file;
 	/**
-	 * Filter the path to the theme template file used for the comments template.
+	 * 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.
 	 */
 	else // Backward compat code will be removed in a future release
 		require( ABSPATH . WPINC . '/theme-compat/comments.php');
 }
 /**
-* Display the JS popup script to show a comment.
+* Displays the link to the comments for the current post ID.
-*
-* If the $file parameter is empty, then the home page is assumed. The defaults
-* for the window are 400px by 400px.
-*
-* For the comment link popup to work, this function has to be called or the
-* normal comment link will be assumed.
-*
-* @global string $wpcommentspopupfile  The URL to use for the popup window.
-* @global int    $wpcommentsjavascript Whether to use JavaScript. Set when function is called.
-*
-* @since 0.71
-*
-* @param int $width  Optional. The width of the popup window. Default 400.
-* @param int $height Optional. The height of the popup window. Default 400.
-* @param string $file Optional. Sets the location of the popup window.
-*/
-function comments_popup_script( $width = 400, $height = 400, $file = '' ) {
-	global $wpcommentspopupfile, $wpcommentsjavascript;
-	if (empty ($file)) {
-		$wpcommentspopupfile = '';  // Use the index.
-	} else {
-		$wpcommentspopupfile = $file;
-	}
-	$wpcommentsjavascript = 1;
-	$javascript = "<script type='text/javascript'>\nfunction wpopen (macagna) {\n    window.open(macagna, '_blank', 'width=$width,height=$height,scrollbars=yes,status=yes');\n}\n</script>\n";
-	echo $javascript;
-}
-/**
-* Displays the link to the comments popup window for the current post ID.
-*
-* Is not meant to be displayed on single posts and pages. Should be used
-* on the lists of posts
-*
-* @global string $wpcommentspopupfile  The URL to use for the popup window.
-* @global int    $wpcommentsjavascript Whether to use JavaScript. Set when function is called.
 *
 * @since 0.71
 *
 * @param 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 string $more      Optional. String to display when there are more than one comment.
 *                          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.
-* @return null Returns null on single posts and pages.
 */
 function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
-	global $wpcommentspopupfile, $wpcommentsjavascript;
 	$id = get_the_ID();
 	$title = get_the_title();
 	$number = get_comments_number( $id );
 	if ( false === $zero ) {
 		echo '<span' . ((!empty($css_class)) ? ' class="' . esc_attr( $css_class ) . '"' : '') . '>' . $none . '</span>';
 		return;
 	}
 	if ( post_password_required() ) {
-		echo __('Enter your password to view comments.');
+		_e( 'Enter your password to view comments.' );
 		return;
 	}
 	echo '<a href="';
-	if ( $wpcommentsjavascript ) {
+	if ( 0 == $number ) {
-		if ( empty( $wpcommentspopupfile ) )
+		$respond_link = get_permalink() . '#respond';
-			$home = home_url();
+		/**
-		else
+		 * Filters the respond link when a post has no comments.
-			$home = get_option('siteurl');
+		 *
-		echo $home . '/' . $wpcommentspopupfile . '?comments_popup=' . $id;
+		 * @since 4.4.0
-		echo '" onclick="wpopen(this.href); return false"';
+		 *
-	} else { // if comments_popup_script() is not in the template, display simple comment link
+		 * @param string $respond_link The default response link.
-		if ( 0 == $number )
+		 * @param integer $id The post ID.
-			echo get_permalink() . '#respond';
+		 */
-		else
+		echo apply_filters( 'respond_link', $respond_link, $id );
-			comments_link();
+	} else {
-		echo '"';
+		comments_link();
 	}
+	echo '"';
 	if ( !empty( $css_class ) ) {
 		echo ' class="'.$css_class.'" ';
 	}
 	$attributes = '';
 	/**
-	 * Filter the comments popup link attributes for display.
+	 * Filters the comments link attributes for display.
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param string $attributes The comments popup link attributes. Default empty.
+	 * @param string $attributes The comments link attributes. Default empty.
 	 */
 	echo apply_filters( 'comments_popup_link_attributes', $attributes );
 	echo '>';
 	comments_number( $zero, $one, $more );
 /**
 * Retrieve HTML content for reply to comment link.
 *
 * @since 2.7.0
+* @since 4.4.0 Added the ability for `$comment` to also accept a WP_Comment object.
 *
 * @param array $args {
 *     Optional. Override default arguments.
 *
 *     @type string $add_below  The first part of the selector used to identify the comment to respond below.
 *     @type string $respond_id The selector identifying the responding comment. Passed as the third parameter
 *                              to addComment.moveForm(), and appended to the link URL as a hash value.
 *                              Default 'respond'.
 *     @type string $reply_text The text of the Reply link. Default 'Reply'.
 *     @type string $login_text The text of the link to reply if logged out. Default 'Log in to Reply'.
-*     @type int    $depth'     The depth of the new comment. Must be greater than 0 and less than the value
+*     @type int    $max_depth  The max depth of the comment tree. Default 0.
+*     @type int    $depth      The depth of the new comment. Must be greater than 0 and less than the value
 *                              of the 'thread_comments_depth' option set in Settings > Discussion. Default 0.
 *     @type string $before     The text or HTML to add before the reply link. Default empty.
 *     @type string $after      The text or HTML to add after the reply link. Default empty.
 * }
-* @param int         $comment Comment being replied to. Default current comment.
+* @param int|WP_Comment $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.
+* @param int|WP_Post    $post    Post ID or WP_Post object the comment is going to be displayed on.
-*                             Default current post.
+*                                Default current post.
-* @return null|false|string Link to show comment form, if successful. False, if comments are closed.
+* @return void|false|string Link to show comment form, if successful. False, if comments are closed.
 */
 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 */
 		'reply_to_text' => __( 'Reply to %s' ),
 		'login_text'    => __( 'Log in to Reply' ),
+		'max_depth'     => 0,
 		'depth'         => 0,
 		'before'        => '',
 		'after'         => ''
 	);
 	if ( ! comments_open( $post->ID ) ) {
 		return false;
 	}
 	/**
-	 * Filter the comment reply link arguments.
+	 * Filters the comment reply link arguments.
 	 *
 	 * @since 4.1.0
 	 *
-	 * @param array   $args    Comment reply link arguments. See {@see get_comment_reply_link()}
+	 * @param array      $args    Comment reply link arguments. See get_comment_reply_link()
-	 *                         for more information on accepted arguments.
+	 *                            for more information on accepted arguments.
-	 * @param object  $comment The object of the comment being replied to.
+	 * @param WP_Comment $comment The object of the comment being replied to.
-	 * @param WP_Post $post    The {@see WP_Post} object.
+	 * @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>',
 	} 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
 		);
-		$link = sprintf( "<a class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
+		$link = sprintf( "<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
-			esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $args['respond_id'],
+			esc_url( add_query_arg( 'replytocom', $comment->comment_ID, get_permalink( $post->ID ) ) ) . "#" . $args['respond_id'],
 			$onclick,
 			esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ),
 			$args['reply_text']
 		);
 	}
-	/**
-	 * Filter the comment reply link.
+	/**
+	 * Filters the comment reply link.
 	 *
 	 * @since 2.7.0
 	 *
 	 * @param string  $link    The HTML markup for the comment reply link.
 	 * @param array   $args    An array of arguments overriding the defaults.
 			$onclick,
 			$args['reply_text']
 		);
 	}
 	$formatted_link = $args['before'] . $link . $args['after'];
-	/**
-	 * Filter the formatted post comments link HTML.
+	/**
+	 * Filters the formatted post comments link HTML.
 	 *
 	 * @since 2.7.0
 	 *
 	 * @param string      $formatted The HTML-formatted post comments link.
 	 * @param int|WP_Post $post      The post ID or WP_Post object.
 * Retrieve HTML content for cancel comment reply link.
 *
 * @since 2.7.0
 *
 * @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) )
 		$text = __('Click here to cancel reply.');
 	$style = isset($_GET['replytocom']) ? '' : ' style="display:none;"';
 	$link = esc_html( remove_query_arg('replytocom') ) . '#respond';
 	$formatted_link = '<a rel="nofollow" id="cancel-comment-reply-link" href="' . $link . '"' . $style . '>' . $text . '</a>';
-	/**
-	 * Filter the cancel comment reply link HTML.
+	/**
+	 * Filters the cancel comment reply link HTML.
 	 *
 	 * @since 2.7.0
 	 *
 	 * @param string $formatted_link The HTML-formatted cancel comment reply link.
 	 * @param string $link           Cancel comment reply link URL.
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
 	$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";
 	/**
-	 * Filter the returned comment id fields.
+	 * Filters the returned comment id fields.
 	 *
 	 * @since 3.0.0
 	 *
 	 * @param string $result    The HTML-formatted hidden id field comment elements.
 	 * @param int    $id        The post ID.
 /**
 * Display text based on comment reply status.
 *
 * Only affects users with JavaScript disabled.
 *
+* @internal The $comment global must be present to allow template tags access to the current
+*           comment. See https://core.trac.wordpress.org/changeset/36512.
+*
 * @since 2.7.0
+*
+* @global WP_Comment $comment Current comment.
 *
 * @param string $noreplytext  Optional. Text to display when not replying to a comment.
 *                             Default false.
 * @param string $replytext    Optional. Text to display when replying to a comment.
 *                             Default false. Accepts "%s" for the author of the comment
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
 	if ( 0 == $replytoid )
 		echo $noreplytext;
 	else {
+		// Sets the global so that template tags can be used in the comment form.
 		$comment = get_comment($replytoid);
-		$author = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author() . '</a>' : get_comment_author();
+		$author = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author( $comment ) . '</a>' : get_comment_author( $comment );
 		printf( $replytext, $author );
 	}
 }
 /**
-* HTML comment list class.
+* List comments.
 *
-* @uses Walker
+* Used in the comments.php template to list comments for a particular post.
+*
 * @since 2.7.0
-*/
-class Walker_Comment extends Walker {
-	/**
-	 * What the class handles.
-	 *
-	 * @see Walker::$tree_type
-	 *
-	 * @since 2.7.0
-	 * @var string
-	 */
-	public $tree_type = 'comment';
-	/**
-	 * DB fields to use.
-	 *
-	 * @see Walker::$db_fields
-	 *
-	 * @since 2.7.0
-	 * @var array
-	 */
-	public $db_fields = array ('parent' => 'comment_parent', 'id' => 'comment_ID');
-	/**
-	 * Start the list before the elements are added.
-	 *
-	 * @see Walker::start_lvl()
-	 *
-	 * @since 2.7.0
-	 *
-	 * @param string $output Passed by reference. Used to append additional content.
-	 * @param int $depth Depth of comment.
-	 * @param array $args Uses 'style' argument for type of HTML list.
-	 */
-	public function start_lvl( &$output, $depth = 0, $args = array() ) {
-		$GLOBALS['comment_depth'] = $depth + 1;
-		switch ( $args['style'] ) {
-			case 'div':
-				break;
-			case 'ol':
-				$output .= '<ol class="children">' . "\n";
-				break;
-			case 'ul':
-			default:
-				$output .= '<ul class="children">' . "\n";
-				break;
-		}
-	}
-	/**
-	 * End the list of items after the elements are added.
-	 *
-	 * @see Walker::end_lvl()
-	 *
-	 * @since 2.7.0
-	 *
-	 * @param string $output Passed by reference. Used to append additional content.
-	 * @param int    $depth  Depth of comment.
-	 * @param array  $args   Will only append content if style argument value is 'ol' or 'ul'.
-	 */
-	public function end_lvl( &$output, $depth = 0, $args = array() ) {
-		$GLOBALS['comment_depth'] = $depth + 1;
-		switch ( $args['style'] ) {
-			case 'div':
-				break;
-			case 'ol':
-				$output .= "</ol><!-- .children -->\n";
-				break;
-			case 'ul':
-			default:
-				$output .= "</ul><!-- .children -->\n";
-				break;
-		}
-	}
-	/**
-	 * Traverse elements to create list from elements.
-	 *
-	 * This function is designed to enhance Walker::display_element() to
-	 * display children of higher nesting levels than selected inline on
-	 * the highest depth level displayed. This prevents them being orphaned
-	 * at the end of the comment list.
-	 *
-	 * Example: max_depth = 2, with 5 levels of nested content.
-	 * 1
-	 *  1.1
-	 *    1.1.1
-	 *    1.1.1.1
-	 *    1.1.1.1.1
-	 *    1.1.2
-	 *    1.1.2.1
-	 * 2
-	 *  2.2
-	 *
-	 * @see Walker::display_element()
-	 * @see wp_list_comments()
-	 *
-	 * @since 2.7.0
-	 *
-	 * @param object $element           Data object.
-	 * @param array  $children_elements List of elements to continue traversing.
-	 * @param int    $max_depth         Max depth to traverse.
-	 * @param int    $depth             Depth of current element.
-	 * @param array  $args              An array of arguments.
-	 * @param string $output            Passed by reference. Used to append additional content.
-	 * @return null Null on failure with no changes to parameters.
-	 */
-	public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {
-		if ( !$element )
-			return;
-		$id_field = $this->db_fields['id'];
-		$id = $element->$id_field;
-		parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output );
-		// If we're at the max depth, and the current element still has children, loop over those and display them at this level
-		// This is to prevent them being orphaned to the end of the list.
-		if ( $max_depth <= $depth + 1 && isset( $children_elements[$id]) ) {
-			foreach ( $children_elements[ $id ] as $child )
-				$this->display_element( $child, $children_elements, $max_depth, $depth, $args, $output );
-			unset( $children_elements[ $id ] );
-		}
-	}
-	/**
-	 * Start the element output.
-	 *
-	 * @since 2.7.0
-	 *
-	 * @see Walker::start_el()
-	 * @see wp_list_comments()
-	 *
-	 * @param string $output  Passed by reference. Used to append additional content.
-	 * @param object $comment Comment data object.
-	 * @param int    $depth   Depth of comment in reference to parents.
-	 * @param array  $args    An array of arguments.
-	 */
-	public function start_el( &$output, $comment, $depth = 0, $args = array(), $id = 0 ) {
-		$depth++;
-		$GLOBALS['comment_depth'] = $depth;
-		$GLOBALS['comment'] = $comment;
-		if ( !empty( $args['callback'] ) ) {
-			ob_start();
-			call_user_func( $args['callback'], $comment, $args, $depth );
-			$output .= ob_get_clean();
-			return;
-		}
-		if ( ( 'pingback' == $comment->comment_type || 'trackback' == $comment->comment_type ) && $args['short_ping'] ) {
-			ob_start();
-			$this->ping( $comment, $depth, $args );
-			$output .= ob_get_clean();
-		} elseif ( 'html5' === $args['format'] ) {
-			ob_start();
-			$this->html5_comment( $comment, $depth, $args );
-			$output .= ob_get_clean();
-		} else {
-			ob_start();
-			$this->comment( $comment, $depth, $args );
-			$output .= ob_get_clean();
-		}
-	}
-	/**
-	 * Ends the element output, if needed.
-	 *
-	 * @since 2.7.0
-	 *
-	 * @see Walker::end_el()
-	 * @see wp_list_comments()
-	 *
-	 * @param string $output  Passed by reference. Used to append additional content.
-	 * @param object $comment The comment object. Default current comment.
-	 * @param int    $depth   Depth of comment.
-	 * @param array  $args    An array of arguments.
-	 */
-	public function end_el( &$output, $comment, $depth = 0, $args = array() ) {
-		if ( !empty( $args['end-callback'] ) ) {
-			ob_start();
-			call_user_func( $args['end-callback'], $comment, $args, $depth );
-			$output .= ob_get_clean();
-			return;
-		}
-		if ( 'div' == $args['style'] )
-			$output .= "</div><!-- #comment-## -->\n";
-		else
-			$output .= "</li><!-- #comment-## -->\n";
-	}
-	/**
-	 * Output a pingback comment.
-	 *
-	 * @access protected
-	 * @since 3.6.0
-	 *
-	 * @see wp_list_comments()
-	 *
-	 * @param object $comment The comment object.
-	 * @param int    $depth   Depth of comment.
-	 * @param array  $args    An array of arguments.
-	 */
-	protected function ping( $comment, $depth, $args ) {
-		$tag = ( 'div' == $args['style'] ) ? 'div' : 'li';
-?>
-		<<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class(); ?>>
-			<div class="comment-body">
-				<?php _e( 'Pingback:' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( 'Edit' ), '<span class="edit-link">', '</span>' ); ?>
-			</div>
-<?php
-	}
-	/**
-	 * Output a single comment.
-	 *
-	 * @access protected
-	 * @since 3.6.0
-	 *
-	 * @see wp_list_comments()
-	 *
-	 * @param object $comment Comment to display.
-	 * @param int    $depth   Depth of comment.
-	 * @param array  $args    An array of arguments.
-	 */
-	protected function comment( $comment, $depth, $args ) {
-		if ( 'div' == $args['style'] ) {
-			$tag = 'div';
-			$add_below = 'comment';
-		} else {
-			$tag = 'li';
-			$add_below = 'div-comment';
-		}
-?>
-		<<?php echo $tag; ?> <?php comment_class( $this->has_children ? 'parent' : '' ); ?> id="comment-<?php comment_ID(); ?>">
-		<?php if ( 'div' != $args['style'] ) : ?>
-		<div id="div-comment-<?php comment_ID(); ?>" class="comment-body">
-		<?php endif; ?>
-		<div class="comment-author vcard">
-			<?php if ( 0 != $args['avatar_size'] ) echo get_avatar( $comment, $args['avatar_size'] ); ?>
-			<?php printf( __( '<cite class="fn">%s</cite> <span class="says">says:</span>' ), get_comment_author_link() ); ?>
-		</div>
-		<?php if ( '0' == $comment->comment_approved ) : ?>
-		<em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ) ?></em>
-		<br />
-		<?php endif; ?>
-		<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID, $args ) ); ?>">
-			<?php
-				/* translators: 1: date, 2: time */
-				printf( __( '%1$s at %2$s' ), get_comment_date(),  get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)' ), '&nbsp;&nbsp;', '' );
-			?>
-		</div>
-		<?php comment_text( get_comment_id(), array_merge( $args, array( 'add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
-		<?php
-		comment_reply_link( array_merge( $args, array(
-			'add_below' => $add_below,
-			'depth'     => $depth,
-			'max_depth' => $args['max_depth'],
-			'before'    => '<div class="reply">',
-			'after'     => '</div>'
-		) ) );
-		?>
-		<?php if ( 'div' != $args['style'] ) : ?>
-		</div>
-		<?php endif; ?>
-<?php
-	}
-	/**
-	 * Output a comment in the HTML5 format.
-	 *
-	 * @access protected
-	 * @since 3.6.0
-	 *
-	 * @see wp_list_comments()
-	 *
-	 * @param object $comment Comment to display.
-	 * @param int    $depth   Depth of comment.
-	 * @param array  $args    An array of arguments.
-	 */
-	protected function html5_comment( $comment, $depth, $args ) {
-		$tag = ( 'div' === $args['style'] ) ? 'div' : 'li';
-?>
-		<<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '' ); ?>>
-			<article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
-				<footer class="comment-meta">
-					<div class="comment-author vcard">
-						<?php if ( 0 != $args['avatar_size'] ) echo get_avatar( $comment, $args['avatar_size'] ); ?>
-						<?php printf( __( '%s <span class="says">says:</span>' ), sprintf( '<b class="fn">%s</b>', get_comment_author_link() ) ); ?>
-					</div><!-- .comment-author -->
-					<div class="comment-metadata">
-						<a href="<?php echo esc_url( get_comment_link( $comment->comment_ID, $args ) ); ?>">
-							<time datetime="<?php comment_time( 'c' ); ?>">
-								<?php printf( _x( '%1$s at %2$s', '1: date, 2: time' ), get_comment_date(), get_comment_time() ); ?>
-							</time>
-						</a>
-						<?php edit_comment_link( __( 'Edit' ), '<span class="edit-link">', '</span>' ); ?>
-					</div><!-- .comment-metadata -->
-					<?php if ( '0' == $comment->comment_approved ) : ?>
-					<p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ); ?></p>
-					<?php endif; ?>
-				</footer><!-- .comment-meta -->
-				<div class="comment-content">
-					<?php comment_text(); ?>
-				</div><!-- .comment-content -->
-				<?php
-				comment_reply_link( array_merge( $args, array(
-					'add_below' => 'div-comment',
-					'depth'     => $depth,
-					'max_depth' => $args['max_depth'],
-					'before'    => '<div class="reply">',
-					'after'     => '</div>'
-				) ) );
-				?>
-			</article><!-- .comment-body -->
-<?php
-	}
-}
-/**
-* List comments.
-*
-* Used in the comments.php template to list comments for a particular post.
-*
-* @since 2.7.0
 *
 * @see WP_Query->comments
+*
+* @global WP_Query $wp_query
+* @global int      $comment_alt
+* @global int      $comment_depth
+* @global int      $comment_thread_alt
+* @global bool     $overridden_cpage
+* @global bool     $in_comment_loop
 *
 * @param string|array $args {
 *     Optional. Formatting options.
 *
 *     @type object $walker            Instance of a Walker class to list comments. Default null.
 *     @type string $type              Type of comments to list.
 *                                     Default 'all'. Accepts 'all', 'comment', 'pingback', 'trackback', 'pings'.
 *     @type int    $page              Page ID to list comments for. Default empty.
 *     @type int    $per_page          Number of comments to list per page. Default empty.
 *     @type int    $avatar_size       Height and width dimensions of the avatar size. Default 32.
-*     @type string $reverse_top_level Ordering of the listed comments. Default null. Accepts 'desc', 'asc'.
+*     @type bool   $reverse_top_level Ordering of the listed comments. If true, will display newest comments first.
 *     @type bool   $reverse_children  Whether to reverse child comments in the list. Default null.
 *     @type string $format            How to format the comments list.
 *                                     Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'.
 *     @type bool   $short_ping        Whether to output short pings. Default false.
 *     @type bool   $echo              Whether to echo the output or return it. Default true.
 * }
-* @param array $comments Optional. Array of comment objects.
+* @param array $comments Optional. Array of WP_Comment objects.
 */
 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;
 	);
 	$r = wp_parse_args( $args, $defaults );
 	/**
-	 * Filter the arguments used in retrieving the comment list.
+	 * Filters the arguments used in retrieving the comment list.
 	 *
 	 * @since 4.0.0
 	 *
 	 * @see wp_list_comments()
 	 *
 			$_comments = $comments_by_type[$r['type']];
 		} else {
 			$_comments = $comments;
 		}
 	} else {
-		if ( empty($wp_query->comments) )
+		/*
-			return;
+		 * If 'page' or 'per_page' has been passed, and does not match what's in $wp_query,
-		if ( 'all' != $r['type'] ) {
+		 * perform a separate comment query and allow Walker_Comment to paginate.
-			if ( empty($wp_query->comments_by_type) )
+		 */
-				$wp_query->comments_by_type = separate_comments($wp_query->comments);
+		if ( $r['page'] || $r['per_page'] ) {
-			if ( empty($wp_query->comments_by_type[$r['type']]) )
+			$current_cpage = get_query_var( 'cpage' );
+			if ( ! $current_cpage ) {
+				$current_cpage = 'newest' === get_option( 'default_comments_page' ) ? 1 : $wp_query->max_num_comment_pages;
+			}
+			$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',
+					'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'];
+					}
+				}
+				$comments = get_comments( $comment_args );
+				if ( 'all' != $r['type'] ) {
+					$comments_by_type = separate_comments( $comments );
+					if ( empty( $comments_by_type[ $r['type'] ] ) ) {
+						return;
+					}
+					$_comments = $comments_by_type[ $r['type'] ];
+				} else {
+					$_comments = $comments;
+				}
+			}
+		// Otherwise, fall back on the comments from `$wp_query->comments`.
+		} else {
+			if ( empty($wp_query->comments) )
 				return;
-			$_comments = $wp_query->comments_by_type[$r['type']];
+			if ( 'all' != $r['type'] ) {
-		} else {
+				if ( empty($wp_query->comments_by_type) )
-			$_comments = $wp_query->comments;
+					$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']];
+			} 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' );
+				if ( 'newest' === $default_comments_page ) {
+					$r['cpage'] = $cpage;
+				/*
+				 * 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['per_page'] = 0;
+			}
 		}
 	}
-	if ( '' === $r['per_page'] && get_option('page_comments') )
+	if ( '' === $r['per_page'] && get_option( 'page_comments' ) ) {
 		$r['per_page'] = get_query_var('comments_per_page');
+	}
 	if ( empty($r['per_page']) ) {
 		$r['per_page'] = 0;
 		$r['page'] = 0;
 	}
 		$r['page'] = 1;
 	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;
 	} else {
 		$walker = $r['walker'];
 	}
 	$output = $walker->paged_walk( $_comments, $r['max_depth'], $r['page'], $r['per_page'], $r );
-	$wp_query->max_num_comment_pages = $walker->max_pages;
 	$in_comment_loop = false;
 	if ( $r['echo'] ) {
 		echo $output;
 		return $output;
 	}
 }
 /**
-* Output a complete commenting form for use within a template.
+* Outputs a complete commenting form for use within a template.
 *
 * Most strings and form fields may be controlled through the $args array passed
-* into the function, while you may also choose to use the comment_form_default_fields
+* into the function, while you may also choose to use the {@see 'comment_form_default_fields'}
 * filter to modify the array of default fields if you'd just like to add a new
 * one or remove a single field. All fields are also individually passed through
-* a filter of the form comment_form_field_$name where $name is the key used
+* a filter of the {@see 'comment_form_field_$name'} where $name is the key used
 * in the array of fields.
 *
 * @since 3.0.0
 * @since 4.1.0 Introduced the 'class_submit' argument.
-* @since 4.2.0 Introduced 'submit_button' and 'submit_fields' arguments.
+* @since 4.2.0 Introduced the 'submit_button' and 'submit_fields' arguments.
+* @since 4.4.0 Introduced the 'class_form', 'title_reply_before', 'title_reply_after',
+*              'cancel_reply_before', and 'cancel_reply_after' arguments.
+* @since 4.5.0 The 'author', 'email', and 'url' form fields are limited to 245, 100,
+*              and 200 characters, respectively.
+* @since 4.6.0 Introduced the 'action' argument.
+* @since 4.9.6 Introduced the 'cookies' default comment field.
 *
 * @param array       $args {
 *     Optional. Default arguments and form fields to override.
 *
 *     @type array $fields {
-*         Default comment fields, filterable by default via the 'comment_form_default_fields' hook.
+*         Default comment fields, filterable by default via the {@see 'comment_form_default_fields'} hook.
 *
-*         @type string $author Comment author field HTML.
+*         @type string $author  Comment author field HTML.
-*         @type string $email  Comment author email field HTML.
+*         @type string $email   Comment author email field HTML.
-*         @type string $url    Comment author URL field HTML.
+*         @type string $url     Comment author URL field HTML.
+*         @type string $cookies Comment cookie opt-in field HTML.
 *     }
 *     @type string $comment_field        The comment textarea field HTML.
 *     @type string $must_log_in          HTML element for a 'must be logged in to comment' message.
 *     @type string $logged_in_as         HTML element for a 'logged in as [user]' message.
-*     @type string $comment_notes_before HTML element for a message displayed before the comment form.
+*     @type string $comment_notes_before HTML element for a message displayed before the comment fields
+*                                        if the user is not logged in.
 *                                        Default 'Your email address will not be published.'.
-*     @type string $comment_notes_after  HTML element for a message displayed after the comment form.
+*     @type string $comment_notes_after  HTML element for a message displayed after the textarea field.
-*                                        Default 'You may use these HTML tags and attributes ...'.
+*     @type string $action               The comment form element action attribute. Default '/wp-comments-post.php'.
 *     @type string $id_form              The comment form element id attribute. Default 'commentform'.
 *     @type string $id_submit            The comment submit element id attribute. Default 'submit'.
+*     @type string $class_form           The comment form element class attribute. Default 'comment-form'.
 *     @type string $class_submit         The comment submit element class attribute. Default 'submit'.
 *     @type string $name_submit          The comment submit element name attribute. Default 'submit'.
 *     @type string $title_reply          The translatable 'reply' button label. Default 'Leave a Reply'.
 *     @type string $title_reply_to       The translatable 'reply-to' button label. Default 'Leave a Reply to %s',
 *                                        where %s is the author of the comment being replied to.
+*     @type string $title_reply_before   HTML displayed before the comment form title.
+*                                        Default: '<h3 id="reply-title" class="comment-reply-title">'.
+*     @type string $title_reply_after    HTML displayed after the comment form title.
+*                                        Default: '</h3>'.
+*     @type string $cancel_reply_before  HTML displayed before the cancel reply link.
+*     @type string $cancel_reply_after   HTML displayed after the cancel reply link.
 *     @type string $cancel_reply_link    The translatable 'cancel reply' button label. Default 'Cancel reply'.
 *     @type string $label_submit         The translatable 'submit' button label. Default 'Post a comment'.
 *     @type string $submit_button        HTML format for the Submit button.
 *                                        Default: '<input name="%1$s" type="submit" id="%2$s" class="%3$s" value="%4$s" />'.
 *     @type string $submit_field         HTML format for the markup surrounding the Submit button and comment hidden
-*                                        fields. Default: '<p class="form-submit">%1$s %2$s</a>', where %1$s is the
+*                                        fields. Default: '<p class="form-submit">%1$s %2$s</p>', where %1$s is the
 *                                        submit button markup and %2$s is the comment hidden fields.
 *     @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 )
 		$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.
+		 *
+		 * @since 3.0.0
+		 */
+		do_action( 'comment_form_comments_closed' );
+		return;
+	}
 	$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'] ) )
 		$args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
 	$req      = get_option( 'require_name_email' );
-	$aria_req = ( $req ? " aria-required='true'" : '' );
 	$html_req = ( $req ? " required='required'" : '' );
 	$html5    = 'html5' === $args['format'];
 	$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"' . $aria_req . $html_req . ' /></p>',
+					 '<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" aria-describedby="email-notes"' . $aria_req . $html_req  . ' /></p>',
+					 '<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" /></p>',
+					 '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
 	);
-	$required_text = sprintf( ' ' . __('Required fields are marked %s'), '<span class="required">*</span>' );
+	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"';
-	/**
+		$fields['cookies'] = '<p class="comment-form-cookies-consent"><input id="wp-comment-cookies-consent" name="wp-comment-cookies-consent" type="checkbox" value="yes"' . $consent . ' />' .
-	 * Filter the default comment form fields.
+							 '<label for="wp-comment-cookies-consent">' . __( 'Save my name, email, and website in this browser for the next time I comment.' ) . '</label></p>';
+		// Ensure that the passed fields include cookies consent.
+		if ( isset( $args['fields'] ) && ! isset( $args['fields']['cookies'] ) ) {
+			$args['fields']['cookies'] = $fields['cookies'];
+		}
+	}
+	$required_text = sprintf( ' ' . __( 'Required fields are marked %s' ), '<span class="required">*</span>' );
+	/**
+	 * Filters the default comment form fields.
 	 *
 	 * @since 3.0.0
 	 *
 	 * @param array $fields The default comment 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" aria-describedby="form-allowed-tags" aria-required="true" required="required"></textarea></p>',
+		'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( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
+		'must_log_in'          => '<p class="must-log-in">' . sprintf(
+		                              /* translators: %s: login URL */
+		                              __( '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 ) )
+		                          ) . '</p>',
 		/** This filter is documented in wp-includes/link-template.php */
-		'logged_in_as'         => '<p class="logged-in-as">' . sprintf( __( 'Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out?</a>' ), get_edit_user_link(), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
+		'logged_in_as'         => '<p class="logged-in-as">' . sprintf(
+		                              /* 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>' ),
+		                              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 ) )
+		                          ) . '</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'  => '<p class="form-allowed-tags" id="form-allowed-tags">' . sprintf( __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes: %s' ), ' <code>' . allowed_tags() . '</code>' ) . '</p>',
+		'comment_notes_after'  => '',
+		'action'               => site_url( '/wp-comments-post.php' ),
 		'id_form'              => 'commentform',
 		'id_submit'            => 'submit',
+		'class_form'           => 'comment-form',
 		'class_submit'         => 'submit',
 		'name_submit'          => 'submit',
 		'title_reply'          => __( 'Leave a Reply' ),
 		'title_reply_to'       => __( 'Leave a Reply to %s' ),
+		'title_reply_before'   => '<h3 id="reply-title" class="comment-reply-title">',
+		'title_reply_after'    => '</h3>',
+		'cancel_reply_before'  => ' <small>',
+		'cancel_reply_after'   => '</small>',
 		'cancel_reply_link'    => __( 'Cancel reply' ),
 		'label_submit'         => __( 'Post Comment' ),
 		'submit_button'        => '<input name="%1$s" type="submit" id="%2$s" class="%3$s" value="%4$s" />',
 		'submit_field'         => '<p class="form-submit">%1$s %2$s</p>',
 		'format'               => 'xhtml',
 	);
 	/**
-	 * Filter the comment form default arguments.
+	 * Filters the comment form default arguments.
 	 *
-	 * Use 'comment_form_default_fields' to filter the comment fields.
+	 * Use {@see 'comment_form_default_fields'} to filter the comment fields.
 	 *
 	 * @since 3.0.0
 	 *
 	 * @param array $defaults The default comment form arguments.
 	 */
 	$args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );
-		if ( comments_open( $post_id ) ) : ?>
+	// Ensure that the filtered args contain all required default values.
-			<?php
+	$args = array_merge( $defaults, $args );
+	/**
+	 * Fires before the comment form.
+	 *
+	 * @since 3.0.0
+	 */
+	do_action( 'comment_form_before' );
+	?>
+	<div id="respond" class="comment-respond">
+		<?php
+		echo $args['title_reply_before'];
+		comment_form_title( $args['title_reply'], $args['title_reply_to'] );
+		echo $args['cancel_reply_before'];
+		cancel_comment_reply_link( $args['cancel_reply_link'] );
+		echo $args['cancel_reply_after'];
+		echo $args['title_reply_after'];
+		if ( get_option( 'comment_registration' ) && !is_user_logged_in() ) :
+			echo $args['must_log_in'];
 			/**
-			 * Fires before the comment form.
+			 * Fires after the HTML-formatted 'must log in after' message in the comment form.
 			 *
 			 * @since 3.0.0
 			 */
-			do_action( 'comment_form_before' );
+			do_action( 'comment_form_must_log_in_after' );
-			?>
+		else : ?>
-			<div id="respond" class="comment-respond">
+			<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' : ''; ?>>
-				<h3 id="reply-title" class="comment-reply-title"><?php comment_form_title( $args['title_reply'], $args['title_reply_to'] ); ?> <small><?php cancel_comment_reply_link( $args['cancel_reply_link'] ); ?></small></h3>
+				<?php
-				<?php if ( get_option( 'comment_registration' ) && !is_user_logged_in() ) : ?>
+				/**
-					<?php echo $args['must_log_in']; ?>
+				 * Fires at the top of the comment form, inside the form tag.
-					<?php
+				 *
+				 * @since 3.0.0
+				 */
+				do_action( 'comment_form_top' );
+				if ( is_user_logged_in() ) :
 					/**
-					 * Fires after the HTML-formatted 'must log in after' message in the comment form.
+					 * Filters the 'logged in' message for the comment form for display.
 					 *
 					 * @since 3.0.0
+					 *
+					 * @param string $args_logged_in The logged-in-as HTML-formatted message.
+					 * @param array  $commenter      An array containing the comment author's
+					 *                               username, email, and URL.
+					 * @param string $user_identity  If the commenter is a registered user,
+					 *                               the display name, blank otherwise.
 					 */
-					do_action( 'comment_form_must_log_in_after' );
+					echo apply_filters( 'comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity );
-					?>
-				<?php else : ?>
+					/**
-					<form action="<?php echo site_url( '/wp-comments-post.php' ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="comment-form"<?php echo $html5 ? ' novalidate' : ''; ?>>
+					 * Fires after the is_user_logged_in() check in the comment form.
-						<?php
+					 *
+					 * @since 3.0.0
+					 *
+					 * @param array  $commenter     An array containing the comment author's
+					 *                              username, email, and URL.
+					 * @param string $user_identity If the commenter is a registered user,
+					 *                              the display name, blank otherwise.
+					 */
+					do_action( 'comment_form_logged_in_after', $commenter, $user_identity );
+				else :
+					echo $args['comment_notes_before'];
+				endif;
+				// Prepare an array of all fields, including the textarea
+				$comment_fields = array( 'comment' => $args['comment_field'] ) + (array) $args['fields'];
+				/**
+				 * Filters the comment form fields, including the textarea.
+				 *
+				 * @since 4.4.0
+				 *
+				 * @param array $comment_fields The comment fields.
+				 */
+				$comment_fields = apply_filters( 'comment_form_fields', $comment_fields );
+				// Get an array of field names, excluding the textarea
+				$comment_field_keys = array_diff( array_keys( $comment_fields ), array( 'comment' ) );
+				// Get the first and the last field name, excluding the textarea
+				$first_field = reset( $comment_field_keys );
+				$last_field  = end( $comment_field_keys );
+				foreach ( $comment_fields as $name => $field ) {
+					if ( 'comment' === $name ) {
 						/**
-						 * Fires at the top of the comment form, inside the form tag.
+						 * Filters the content of the comment textarea field for display.
-						 *
-						 * @since 3.0.0
-						 */
-						do_action( 'comment_form_top' );
-						?>
-						<?php if ( is_user_logged_in() ) : ?>
-							<?php
-							/**
-							 * Filter the 'logged in' message for the comment form for display.
-							 *
-							 * @since 3.0.0
-							 *
-							 * @param string $args_logged_in The logged-in-as HTML-formatted message.
-							 * @param array  $commenter      An array containing the comment author's
-							 *                               username, email, and URL.
-							 * @param string $user_identity  If the commenter is a registered user,
-							 *                               the display name, blank otherwise.
-							 */
-							echo apply_filters( 'comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity );
-							?>
-							<?php
-							/**
-							 * Fires after the is_user_logged_in() check in the comment form.
-							 *
-							 * @since 3.0.0
-							 *
-							 * @param array  $commenter     An array containing the comment author's
-							 *                              username, email, and URL.
-							 * @param string $user_identity If the commenter is a registered user,
-							 *                              the display name, blank otherwise.
-							 */
-							do_action( 'comment_form_logged_in_after', $commenter, $user_identity );
-							?>
-						<?php else : ?>
-							<?php echo $args['comment_notes_before']; ?>
-							<?php
-							/**
-							 * Fires before the comment fields in the comment form.
-							 *
-							 * @since 3.0.0
-							 */
-							do_action( 'comment_form_before_fields' );
-							foreach ( (array) $args['fields'] as $name => $field ) {
-								/**
-								 * Filter a comment form field for display.
-								 *
-								 * The dynamic portion of the filter hook, `$name`, refers to the name
-								 * of the comment form field. Such as 'author', 'email', or 'url'.
-								 *
-								 * @since 3.0.0
-								 *
-								 * @param string $field The HTML-formatted output of the comment form field.
-								 */
-								echo apply_filters( "comment_form_field_{$name}", $field ) . "\n";
-							}
-							/**
-							 * Fires after the comment fields in the comment form.
-							 *
-							 * @since 3.0.0
-							 */
-							do_action( 'comment_form_after_fields' );
-							?>
-						<?php endif; ?>
-						<?php
-						/**
-						 * Filter the content of the comment textarea field for display.
 						 *
 						 * @since 3.0.0
 						 *
 						 * @param string $args_comment_field The content of the comment textarea field.
 						 */
-						echo apply_filters( 'comment_form_field_comment', $args['comment_field'] );
+						echo apply_filters( 'comment_form_field_comment', $field );
-						?>
-						<?php echo $args['comment_notes_after']; ?>
+						echo $args['comment_notes_after'];
-						<?php
+					} elseif ( ! is_user_logged_in() ) {
-						$submit_button = sprintf(
-							$args['submit_button'],
+						if ( $first_field === $name ) {
-							esc_attr( $args['name_submit'] ),
+							/**
-							esc_attr( $args['id_submit'] ),
+							 * Fires before the comment fields in the comment form, excluding the textarea.
-							esc_attr( $args['class_submit'] ),
+							 *
-							esc_attr( $args['label_submit'] )
+							 * @since 3.0.0
-						);
+							 */
+							do_action( 'comment_form_before_fields' );
+						}
 						/**
-						 * Filter the submit button for the comment form to display.
+						 * Filters a comment form field for display.
 						 *
-						 * @since 4.2.0
+						 * The dynamic portion of the filter hook, `$name`, refers to the name
+						 * of the comment form field. Such as 'author', 'email', or 'url'.
 						 *
-						 * @param string $submit_button HTML markup for the submit button.
+						 * @since 3.0.0
-						 * @param array  $args          Arguments passed to `comment_form()`.
+						 *
+						 * @param string $field The HTML-formatted output of the comment form field.
 						 */
-						$submit_button = apply_filters( 'comment_form_submit_button', $submit_button, $args );
+						echo apply_filters( "comment_form_field_{$name}", $field ) . "\n";
-						$submit_field = sprintf(
+						if ( $last_field === $name ) {
-							$args['submit_field'],
+							/**
-							$submit_button,
+							 * Fires after the comment fields in the comment form, excluding the textarea.
-							get_comment_id_fields( $post_id )
+							 *
-						);
+							 * @since 3.0.0
+							 */
-						/**
+							do_action( 'comment_form_after_fields' );
-						 * Filter the submit field for the comment form to display.
+						}
-						 *
+					}
-						 * The submit field includes the submit button, hidden fields for the
+				}
-						 * comment form, and any wrapper markup.
-						 *
+				$submit_button = sprintf(
-						 * @since 4.2.0
+					$args['submit_button'],
-						 *
+					esc_attr( $args['name_submit'] ),
-						 * @param string $submit_field HTML markup for the submit field.
+					esc_attr( $args['id_submit'] ),
-						 * @param array  $args         Arguments passed to comment_form().
+					esc_attr( $args['class_submit'] ),
-						 */
+					esc_attr( $args['label_submit'] )
-						echo apply_filters( 'comment_form_submit_field', $submit_field, $args );
+				);
-						/**
+				/**
-						 * Fires at the bottom of the comment form, inside the closing </form> tag.
+				 * Filters the submit button for the comment form to display.
-						 *
+				 *
-						 * @since 1.5.0
+				 * @since 4.2.0
-						 *
+				 *
-						 * @param int $post_id The post ID.
+				 * @param string $submit_button HTML markup for the submit button.
-						 */
+				 * @param array  $args          Arguments passed to `comment_form()`.
-						do_action( 'comment_form', $post_id );
+				 */
-						?>
+				$submit_button = apply_filters( 'comment_form_submit_button', $submit_button, $args );
-					</form>
-				<?php endif; ?>
+				$submit_field = sprintf(
-			</div><!-- #respond -->
+					$args['submit_field'],
-			<?php
+					$submit_button,
-			/**
+					get_comment_id_fields( $post_id )
-			 * Fires after the comment form.
+				);
-			 *
-			 * @since 3.0.0
+				/**
-			 */
+				 * Filters the submit field for the comment form to display.
-			do_action( 'comment_form_after' );
+				 *
-		else :
+				 * The submit field includes the submit button, hidden fields for the
-			/**
+				 * comment form, and any wrapper markup.
-			 * Fires after the comment form if comments are closed.
+				 *
-			 *
+				 * @since 4.2.0
-			 * @since 3.0.0
+				 *
-			 */
+				 * @param string $submit_field HTML markup for the submit field.
-			do_action( 'comment_form_comments_closed' );
+				 * @param array  $args         Arguments passed to comment_form().
-		endif;
+				 */
-}
+				echo apply_filters( 'comment_form_submit_field', $submit_field, $args );
+				/**
+				 * Fires at the bottom of the comment form, inside the closing </form> tag.
+				 *
+				 * @since 1.5.0
+				 *
+				 * @param int $post_id The post ID.
+				 */
+				do_action( 'comment_form', $post_id );
+				?>
+			</form>
+		<?php endif; ?>
+	</div><!-- #respond -->
+	<?php
+	/**
+	 * Fires after the comment form.
+	 *
+	 * @since 3.0.0
+	 */
+	do_action( 'comment_form_after' );
+}

changeset 7	cf61fcea0001
parent 5	5e2f62d02dcd
child 9	177826044cd9