site_iri: comparison web/wp-includes/comment-template.php

equal deleted inserted replaced

-:2f6f6f7551ca
+:32102edaa81b
 * assumed.
 *
 * @since 1.5.0
 * @uses apply_filters() Calls 'get_comment_author' hook on the comment author
 *
+* @param int $comment_ID The ID of the comment for which to retrieve the author. Optional.
 * @return string The comment author
 */
-function get_comment_author() {
+function get_comment_author( $comment_ID = 0 ) {
-	global $comment;
+	$comment = get_comment( $comment_ID );
 	if ( empty($comment->comment_author) ) {
 		if (!empty($comment->user_id)){
 			$user=get_userdata($comment->user_id);
 			$author=$user->user_login;
 		} else {
 /**
 * Displays the author of the current comment.
 *
 * @since 0.71
 * @uses apply_filters() Calls 'comment_author' on comment author before displaying
-*/
+*
-function comment_author() {
+* @param int $comment_ID The ID of the comment for which to print the author. Optional.
-	$author = apply_filters('comment_author', get_comment_author() );
+*/
+function comment_author( $comment_ID = 0 ) {
+	$author = apply_filters('comment_author', get_comment_author( $comment_ID ) );
 	echo $author;
 }
 /**
 * Retrieve the email of the author of the current comment.
 *
 * @since 1.5.0
 * @uses apply_filters() Calls the 'get_comment_author_email' hook on the comment author email
 * @uses $comment
 *
+* @param int $comment_ID The ID of the comment for which to get the author's email. Optional.
 * @return string The current comment author's email
 */
-function get_comment_author_email() {
+function get_comment_author_email( $comment_ID = 0 ) {
-	global $comment;
+	$comment = get_comment( $comment_ID );
 	return apply_filters('get_comment_author_email', $comment->comment_author_email);
 }
 /**
 * Display the email of the author of the current global $comment.
 * 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
 * @uses apply_filters() Calls 'author_email' hook on the author email
-*/
+*
-function comment_author_email() {
+* @param int $comment_ID The ID of the comment for which to print the author's email. Optional.
-	echo apply_filters('author_email', get_comment_author_email() );
+*/
+function comment_author_email( $comment_ID = 0 ) {
+	echo apply_filters('author_email', get_comment_author_email( $comment_ID ) );
 }
 /**
 * Display the html email link to the author of the current comment.
 *
 * Retrieve the html link to the url of the author of the current comment.
 *
 * @since 1.5.0
 * @uses apply_filters() Calls 'get_comment_author_link' hook on the complete link HTML or author
 *
+* @param int $comment_ID The ID of the comment for which to get the author's link. Optional.
 * @return string Comment Author name or HTML link for author's URL
 */
-function get_comment_author_link() {
+function get_comment_author_link( $comment_ID = 0 ) {
 	/** @todo Only call these functions when they are needed. Include in if... else blocks */
-	$url    = get_comment_author_url();
+	$url    = get_comment_author_url( $comment_ID );
-	$author = get_comment_author();
+	$author = get_comment_author( $comment_ID );
 	if ( empty( $url ) || 'http://' == $url )
 		$return = $author;
 	else
 		$return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
 /**
 * Display the html link to the url of the author of the current comment.
 *
 * @since 0.71
-* @see get_comment_author_link() Echos result
+* @see get_comment_author_link() Echoes result
-*/
+*
-function comment_author_link() {
+* @param int $comment_ID The ID of the comment for which to print the author's link. Optional.
-	echo get_comment_author_link();
+*/
+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
 * @uses $comment
 * @uses apply_filters()
 *
-* @return unknown
+* @param int $comment_ID The ID of the comment for which to get the author's IP address. Optional.
-*/
+* @return string The comment author's IP address.
-function get_comment_author_IP() {
+*/
-	global $comment;
+function get_comment_author_IP( $comment_ID = 0 ) {
+	$comment = get_comment( $comment_ID );
 	return apply_filters('get_comment_author_IP', $comment->comment_author_IP);
 }
 /**
 * Display the IP address of the author of the current comment.
 *
 * @since 0.71
-* @see get_comment_author_IP() Echos Result
+* @see get_comment_author_IP() Echoes Result
-*/
+*
-function comment_author_IP() {
+* @param int $comment_ID The ID of the comment for which to print the author's IP address. Optional.
-	echo get_comment_author_IP();
+*/
+function comment_author_IP( $comment_ID = 0 ) {
+	echo get_comment_author_IP( $comment_ID );
 }
 /**
 * Retrieve the url of the author of the current comment.
 *
 * @since 1.5.0
 * @uses apply_filters() Calls 'get_comment_author_url' hook on the comment author's URL
 *
+* @param int $comment_ID The ID of the comment for which to get the author's URL. Optional.
 * @return string
 */
-function get_comment_author_url() {
+function get_comment_author_url( $comment_ID = 0 ) {
-	global $comment;
+	$comment = get_comment( $comment_ID );
 	$url = ('http://' == $comment->comment_author_url) ? '' : $comment->comment_author_url;
 	$url = esc_url( $url, array('http', 'https') );
 	return apply_filters('get_comment_author_url', $url);
 }
 * Display the url of the author of the current comment.
 *
 * @since 0.71
 * @uses apply_filters()
 * @uses get_comment_author_url() Retrieves the comment author's URL
-*/
+*
-function comment_author_url() {
+* @param int $comment_ID The ID of the comment for which to print the author's URL. Optional.
-	echo apply_filters('comment_url', get_comment_author_url());
+*/
+function comment_author_url( $comment_ID = 0 ) {
+	echo apply_filters('comment_url', get_comment_author_url( $comment_ID ));
 }
 /**
 * Retrieves the HTML link of the url of the author of the current comment.
 *
 /**
 * Displays the HTML link of the url of the author of the current comment.
 *
 * @since 0.71
-* @see get_comment_author_url_link() Echos result
+* @see get_comment_author_url_link() Echoes result
 *
 * @param string $linktext The text to display instead of the comment author's email address
 * @param string $before The text or HTML to display before the email link.
 * @param string $after The text or HTML to display after the email link.
 */
 /**
 * Retrieve the comment date of the current comment.
 *
 * @since 1.5.0
-* @uses apply_filters() Calls 'get_comment_date' hook with the formated date and the $d parameter respectively
+* @uses apply_filters() Calls 'get_comment_date' hook with the formatted date and the $d parameter respectively
 * @uses $comment
 *
 * @param string $d The format of the date (defaults to user's config)
+* @param int $comment_ID The ID of the comment for which to get the date. Optional.
 * @return string The comment's date
 */
-function get_comment_date( $d = '' ) {
+function get_comment_date( $d = '', $comment_ID = 0 ) {
-	global $comment;
+	$comment = get_comment( $comment_ID );
 	if ( '' == $d )
 		$date = mysql2date(get_option('date_format'), $comment->comment_date);
 	else
 		$date = mysql2date($d, $comment->comment_date);
 	return apply_filters('get_comment_date', $date, $d);
 * Display the comment date of the current comment.
 *
 * @since 0.71
 *
 * @param string $d The format of the date (defaults to user's config)
-*/
+* @param int $comment_ID The ID of the comment for which to print the date. Optional.
-function comment_date( $d = '' ) {
+*/
-	echo get_comment_date( $d );
+function comment_date( $d = '', $comment_ID = 0 ) {
+	echo get_comment_date( $d, $comment_ID );
 }
 /**
 * Retrieve the excerpt of the current comment.
 *
 *
 * @since 1.5.0
 * @uses $comment
 * @uses apply_filters() Calls 'get_comment_excerpt' on truncated comment
 *
+* @param int $comment_ID The ID of the comment for which to get the excerpt. Optional.
 * @return string The maybe truncated comment with 20 words or less
 */
-function get_comment_excerpt() {
+function get_comment_excerpt( $comment_ID = 0 ) {
-	global $comment;
+	$comment = get_comment( $comment_ID );
 	$comment_text = strip_tags($comment->comment_content);
 	$blah = explode(' ', $comment_text);
 	if (count($blah) > 20) {
 		$k = 20;
 		$use_dotdotdot = 1;
 /**
 * Display the excerpt of the current comment.
 *
 * @since 1.2.0
 * @uses apply_filters() Calls 'comment_excerpt' hook before displaying excerpt
-*/
+*
-function comment_excerpt() {
+* @param int $comment_ID The ID of the comment for which to print the excerpt. Optional.
-	echo apply_filters('comment_excerpt', get_comment_excerpt() );
+*/
+function comment_excerpt( $comment_ID = 0 ) {
+	echo apply_filters('comment_excerpt', get_comment_excerpt($comment_ID) );
 }
 /**
 * Retrieve the comment id of the current comment.
 *
 /**
 * Displays the comment id of the current comment.
 *
 * @since 0.71
-* @see get_comment_ID() Echos Result
+* @see get_comment_ID() Echoes Result
 */
 function comment_ID() {
 	echo get_comment_ID();
 }
 /**
 * Retrieves the link to the current post comments.
 *
 * @since 1.5.0
 *
+* @param int $post_id Optional post id
 * @return string The link to the comments
 */
-function get_comments_link() {
+function get_comments_link($post_id = 0) {
-	return get_permalink() . '#comments';
+	return get_permalink($post_id) . '#comments';
 }
 /**
 * Displays the link to the current post comments.
 *
 * @since 0.71
 *
 * @param string $deprecated Not Used
-* @param bool $deprecated Not Used
+* @param bool $deprecated_2 Not Used
 */
-function comments_link( $deprecated = '', $deprecated = '' ) {
+function comments_link( $deprecated = '', $deprecated_2 = '' ) {
+	if ( !empty( $deprecated ) )
+		_deprecated_argument( __FUNCTION__, '0.72' );
+	if ( !empty( $deprecated_2 ) )
+		_deprecated_argument( __FUNCTION__, '1.3' );
 	echo get_comments_link();
 }
 /**
 * Retrieve the amount of comments a post has.
 *
 * @param int $post_id The Post ID
 * @return int The number of comments a post has
 */
 function get_comments_number( $post_id = 0 ) {
-	global $id;
+	$post_id = absint( $post_id );
-	$post_id = (int) $post_id;
 	if ( !$post_id )
-		$post_id = (int) $id;
+		$post_id = get_the_ID();
 	$post = get_post($post_id);
 	if ( ! isset($post->comment_count) )
 		$count = 0;
 	else
 /**
 * Display the language string for the number of comments the current post has.
 *
 * @since 0.71
-* @uses $id
 * @uses apply_filters() Calls the 'comments_number' hook on the output and number of comments respectively.
 *
 * @param string $zero Text for no comments
 * @param string $one Text for one comment
 * @param string $more Text for more than one comment
 * @param string $deprecated Not used.
 */
 function comments_number( $zero = false, $one = false, $more = false, $deprecated = '' ) {
-	global $id;
+	if ( !empty( $deprecated ) )
-	$number = get_comments_number($id);
+		_deprecated_argument( __FUNCTION__, '1.3' );
+	$number = get_comments_number();
 	if ( $number > 1 )
 		$output = str_replace('%', number_format_i18n($number), ( false === $more ) ? __('% Comments') : $more);
 	elseif ( $number == 0 )
 		$output = ( false === $zero ) ? __('No Comments') : $zero;
 * Retrieve the text of the current comment.
 *
 * @since 1.5.0
 * @uses $comment
 *
+* @param int $comment_ID The ID of the comment for which to get the text. Optional.
 * @return string The comment content
 */
-function get_comment_text() {
+function get_comment_text( $comment_ID = 0 ) {
-	global $comment;
+	$comment = get_comment( $comment_ID );
-	return apply_filters('get_comment_text', $comment->comment_content);
+	return apply_filters( 'get_comment_text', $comment->comment_content, $comment );
 }
 /**
 * Displays the text of the current comment.
 *
 * @since 0.71
 * @uses apply_filters() Passes the comment content through the 'comment_text' hook before display
 * @uses get_comment_text() Gets the comment content
-*/
+*
-function comment_text() {
+* @param int $comment_ID The ID of the comment for which to print the text. Optional.
-	echo apply_filters('comment_text', get_comment_text() );
+*/
+function comment_text( $comment_ID = 0 ) {
+	$comment = get_comment( $comment_ID );
+	echo apply_filters( 'comment_text', get_comment_text( $comment_ID ), $comment );
 }
 /**
 * Retrieve the comment time of the current comment.
 *
 *
 * @since 1.5.0
 * @uses $comment
 * @uses apply_filters() Calls the 'get_comment_type' hook on the comment type
 *
+* @param int $comment_ID The ID of the comment for which to get the type. Optional.
 * @return string The comment type
 */
-function get_comment_type() {
+function get_comment_type( $comment_ID = 0 ) {
-	global $comment;
+	$comment = get_comment( $comment_ID );
 	if ( '' == $comment->comment_type )
 		$comment->comment_type = 'comment';
 	return apply_filters('get_comment_type', $comment->comment_type);
 }
 * @param string $commenttxt The string to display for comment type
 * @param string $trackbacktxt The string to display for trackback type
 * @param string $pingbacktxt The string to display for pingback type
 */
 function comment_type($commenttxt = false, $trackbacktxt = false, $pingbacktxt = false) {
-if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
+	if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
-if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
+	if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
-if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
+	if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
 	$type = get_comment_type();
 	switch( $type ) {
 		case 'trackback' :
 			echo $trackbacktxt;
 			break;
 * retrieve the pretty path. If permalinks weren't enabled, the ID of the
 * current post is used and appended to the correct page to go to.
 *
 * @since 1.5.0
 * @uses apply_filters() Calls 'trackback_url' on the resulting trackback URL
-* @uses $id
 *
 * @return string The trackback URL after being filtered
 */
 function get_trackback_url() {
-	global $id;
 	if ( '' != get_option('permalink_structure') ) {
 		$tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
 	} else {
-		$tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . $id;
+		$tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
 	}
 	return apply_filters('trackback_url', $tb_url);
 }
 /**
 * Displays the current post's trackback URL.
 *
 * @since 0.71
 * @uses get_trackback_url() Gets the trackback url for the current post
 *
-* @param bool $deprecated Remove backwards compat in 2.5
+* @param bool $deprecated_echo Remove backwards compat in 2.5
 * @return void|string Should only be used to echo the trackback URL, use get_trackback_url() for the result instead.
 */
-function trackback_url($deprecated = true) {
+function trackback_url( $deprecated_echo = true ) {
-	if ($deprecated) echo get_trackback_url();
+	if ( $deprecated_echo !== true )
-	else return get_trackback_url();
+		_deprecated_argument( __FUNCTION__, '2.5', __('Use <code>get_trackback_url()</code> instead if you do not want the value echoed.') );
+	if ( $deprecated_echo )
+		echo get_trackback_url();
+	else
+		return get_trackback_url();
 }
 /**
 * Generates and displays the RDF for the trackback information of current post.
 *
+* Deprecated in 3.0.0, and restored in 3.0.1.
+*
 * @since 0.71
 *
 * @param int $deprecated Not used (Was $timezone = 0)
 */
-function trackback_rdf($deprecated = '') {
+function trackback_rdf( $deprecated = '' ) {
-	if (stripos($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator') === false) {
+	if ( !empty( $deprecated ) )
-		echo '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+		_deprecated_argument( __FUNCTION__, '2.5' );
-				xmlns:dc="http://purl.org/dc/elements/1.1/"
-				xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/">
+	if ( false !== stripos($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator') )
-			<rdf:Description rdf:about="';
+		return;
-		the_permalink();
-		echo '"'."\n";
+	echo '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-		echo '    dc:identifier="';
+			xmlns:dc="http://purl.org/dc/elements/1.1/"
-		the_permalink();
+			xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/">
-		echo '"'."\n";
+		<rdf:Description rdf:about="';
-		echo '    dc:title="'.str_replace('--', '&#x2d;&#x2d;', wptexturize(strip_tags(get_the_title()))).'"'."\n";
+	the_permalink();
-		echo '    trackback:ping="'.get_trackback_url().'"'." />\n";
+	echo '"'."\n";
-		echo '</rdf:RDF>';
+	echo '    dc:identifier="';
-	}
+	the_permalink();
+	echo '"'."\n";
+	echo '    dc:title="'.str_replace('--', '&#x2d;&#x2d;', wptexturize(strip_tags(get_the_title()))).'"'."\n";
+	echo '    trackback:ping="'.get_trackback_url().'"'." />\n";
+	echo '</rdf:RDF>';
 }
 /**
 * Whether the current post is open for comments.
 *
 * @uses $post
 *
 * @param int $post_id An optional post ID to check instead of the current post.
 * @return bool True if the comments are open
 */
-function comments_open( $post_id=NULL ) {
+function comments_open( $post_id = null ) {
 	$_post = get_post($post_id);
 	$open = ( 'open' == $_post->comment_status );
 	return apply_filters( 'comments_open', $open, $post_id );
 * @uses $post
 *
 * @param int $post_id An optional post ID to check instead of the current post.
 * @return bool True if pings are accepted
 */
-function pings_open( $post_id = NULL ) {
+function pings_open( $post_id = null ) {
 	$_post = get_post($post_id);
 	$open = ( 'open' == $_post->ping_status );
 	return apply_filters( 'pings_open', $open, $post_id );
 	$post_id = 0;
 	if ( !empty($post) )
 		$post_id = $post->ID;
-	if ( current_user_can('unfiltered_html') )
+	if ( current_user_can( 'unfiltered_html' ) ) {
-		wp_nonce_field('unfiltered-html-comment_' . $post_id, '_wp_unfiltered_html_comment', false);
+		wp_nonce_field( 'unfiltered-html-comment_' . $post_id, '_wp_unfiltered_html_comment_disabled', false );
+		echo "<script>(function(){if(window===window.parent){document.getElementById('_wp_unfiltered_html_comment_disabled').name='_wp_unfiltered_html_comment';}})();</script>\n";
+	}
 }
 /**
 * Loads the comment template specified in $file.
 *
 * are passed through the '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'
 * which includes the TEMPLATEPATH and $file combined. Tries the $filtered path
-* first and if it fails it will require the default comment themplate from the
+* 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.
 *
 * @since 1.5.0
 * @global array $comment List of comment objects for the current post
 * @uses $wpdb
-* @uses $id
 * @uses $post
 * @uses $withcomments Will not try to get the comments if the post has none.
 *
 * @param string $file Optional, default '/comments.php'. The file to load
 * @param bool $separate_comments Optional, whether to separate the comments by comment type. Default is false.
 	if ( $separate_comments ) {
 		$wp_query->comments_by_type = &separate_comments($comments);
 		$comments_by_type = &$wp_query->comments_by_type;
 	}
-	$overridden_cpage = FALSE;
+	$overridden_cpage = false;
 	if ( '' == get_query_var('cpage') && get_option('page_comments') ) {
 		set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
-		$overridden_cpage = TRUE;
+		$overridden_cpage = true;
 	}
 	if ( !defined('COMMENTS_TEMPLATE') || !COMMENTS_TEMPLATE)
 		define('COMMENTS_TEMPLATE', true);
 	$include = apply_filters('comments_template', STYLESHEETPATH . $file );
 	if ( file_exists( $include ) )
 		require( $include );
 	elseif ( file_exists( TEMPLATEPATH . $file ) )
-		require( TEMPLATEPATH .  $file );
+		require( TEMPLATEPATH . $file );
-	else
+	else // Backward compat code will be removed in a future release
-		require( get_theme_root() . '/default/comments.php');
+		require( ABSPATH . WPINC . '/theme-compat/comments.php');
 }
 /**
 * Displays the JS popup script to show a comment.
 *
 * For the comment link popup to work, this function has to be called or the
 * normal comment link will be assumed.
 *
 * @since 0.71
 * @global string $wpcommentspopupfile The URL to use for the popup window
-* @global int $wpcommentsjavascript Whether to use JavaScript or not. Set when function is called
+* @global int $wpcommentsjavascript Whether to use JavaScript. Set when function is called
 *
 * @param int $width Optional. The width of the popup window
 * @param int $height Optional. The height of the popup window
 * @param string $file Optional. Sets the location of the popup window
 */
 *
 * Is not meant to be displayed on single posts and pages. Should be used on the
 * lists of posts
 *
 * @since 0.71
-* @uses $id
 * @uses $wpcommentspopupfile
 * @uses $wpcommentsjavascript
 * @uses $post
 *
 * @param string $zero The string to display when no comments
 * @param string $css_class The CSS class to use for comments
 * @param string $none The string to display when comments have been turned off
 * @return null Returns null on single posts and pages.
 */
 function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
-	global $id, $wpcommentspopupfile, $wpcommentsjavascript, $post;
+	global $wpcommentspopupfile, $wpcommentsjavascript;
-if ( false === $zero ) $zero = __( 'No Comments' );
+	$id = get_the_ID();
-if ( false === $one ) $one = __( '1 Comment' );
-if ( false === $more ) $more = __( '% Comments' );
+	if ( false === $zero ) $zero = __( 'No Comments' );
-if ( false === $none ) $none = __( 'Comments Off' );
+	if ( false === $one ) $one = __( '1 Comment' );
+	if ( false === $more ) $more = __( '% Comments' );
+	if ( false === $none ) $none = __( 'Comments Off' );
 	$number = get_comments_number( $id );
 	if ( 0 == $number && !comments_open() && !pings_open() ) {
 		echo '<span' . ((!empty($css_class)) ? ' class="' . esc_attr( $css_class ) . '"' : '') . '>' . $none . '</span>';
 		return;
 	}
 	if ( post_password_required() ) {
-		echo __('Enter your password to view comments');
+		echo __('Enter your password to view comments.');
 		return;
 	}
 	echo '<a href="';
 	if ( $wpcommentsjavascript ) {
 		if ( empty( $wpcommentspopupfile ) )
-			$home = get_option('home');
+			$home = home_url();
 		else
 			$home = get_option('siteurl');
 		echo $home . '/' . $wpcommentspopupfile . '?comments_popup=' . $id;
 		echo '" onclick="wpopen(this.href); return false"';
 	} else { // if comments_popup_script() is not in the template, display simple comment link
 	}
 	if ( !empty( $css_class ) ) {
 		echo ' class="'.$css_class.'" ';
 	}
-	$title = the_title_attribute( 'echo=0' );
+	$title = the_title_attribute( array('echo' => 0 ) );
 	echo apply_filters( 'comments_popup_link_attributes', '' );
 	echo ' title="' . esc_attr( sprintf( __('Comment on %s'), $title ) ) . '">';
-	comments_number( $zero, $one, $more, $number );
+	comments_number( $zero, $one, $more );
 	echo '</a>';
 }
 /**
 * Retrieve HTML content for reply to comment link.
 		return;
 	extract($args, EXTR_SKIP);
 	$comment = get_comment($comment);
+	if ( empty($post) )
+		$post = $comment->comment_post_ID;
 	$post = get_post($post);
 	if ( !comments_open($post->ID) )
 		return false;
 	$link = '';
 	if ( get_option('comment_registration') && !$user_ID )
 		$link = '<a rel="nofollow" class="comment-reply-login" href="' . esc_url( wp_login_url( get_permalink() ) ) . '">' . $login_text . '</a>';
 	else
-		$link = "<a rel='nofollow' class='comment-reply-link' href='" . esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $respond_id . "' onclick='return addComment.moveForm(\"$add_below-$comment->comment_ID\", \"$comment->comment_ID\", \"$respond_id\", \"$post->ID\")'>$reply_text</a>";
+		$link = "<a class='comment-reply-link' href='" . esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $respond_id . "' onclick='return addComment.moveForm(\"$add_below-$comment->comment_ID\", \"$comment->comment_ID\", \"$respond_id\", \"$post->ID\")'>$reply_text</a>";
 	return apply_filters('comment_reply_link', $before . $link . $after, $args, $comment, $post);
 }
 /**
 * Displays the HTML content for reply to comment link.
 * parameters.
 *
 * @since 2.7.0
 *
 * @param array $args Optional. Override default options.
-* @param int|object $post Optional. Post that the comment is going to be displayed on.  Defaults to current post.
+* @param int|object $post Optional. Post that the comment is going to be displayed on. Defaults to current post.
 * @return string|bool|null Link to show comment form, if successful. False, if comments are closed.
 */
 function get_post_reply_link($args = array(), $post = null) {
 	global $user_ID;
 function cancel_comment_reply_link($text = '') {
 	echo get_cancel_comment_reply_link($text);
 }
 /**
+* Retrieve hidden input HTML for replying to comments.
+*
+* @since 3.0.0
+*
+* @return string Hidden input HTML for replying to comments
+*/
+function get_comment_id_fields( $id = 0 ) {
+	if ( empty( $id ) )
+		$id = get_the_ID();
+	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
+	$result  = "<input type='hidden' name='comment_post_ID' value='$id' id='comment_post_ID' />\n";
+	$result .= "<input type='hidden' name='comment_parent' id='comment_parent' value='$replytoid' />\n";
+	return apply_filters('comment_id_fields', $result, $id, $replytoid);
+}
+/**
 * Output hidden input HTML for replying to comments.
 *
 * @since 2.7.0
-*/
+* @see get_comment_id_fields() Echoes result
-function comment_id_fields() {
+*/
-	global $id;
+function comment_id_fields( $id = 0 ) {
+	echo get_comment_id_fields( $id );
-	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
-	echo "<input type='hidden' name='comment_post_ID' value='$id' id='comment_post_ID' />\n";
-	echo "<input type='hidden' name='comment_parent' id='comment_parent' value='$replytoid' />\n";
 }
 /**
 * Display text based on comment reply status. Only affects users with Javascript disabled.
 *
 *
 * @param string $noreplytext Optional. Text to display when not replying to a comment.
 * @param string $replytext Optional. Text to display when replying to a comment. Accepts "%s" for the author of the comment being replied to.
 * @param string $linktoparent Optional. Boolean to control making the author's name a link to their comment.
 */
-function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = TRUE ) {
+function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
 	global $comment;
 	if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
 	if ( false === $replytext ) $replytext = __( 'Leave a Reply to %s' );
 /**
 * HTML comment list class.
 *
 * @package WordPress
 * @uses Walker
-* @since unknown
+* @since 2.7.0
 */
 class Walker_Comment extends Walker {
 	/**
 	 * @see Walker::$tree_type
-	 * @since unknown
+	 * @since 2.7.0
 	 * @var string
 	 */
 	var $tree_type = 'comment';
 	/**
 	 * @see Walker::$db_fields
-	 * @since unknown
+	 * @since 2.7.0
 	 * @var array
 	 */
 	var $db_fields = array ('parent' => 'comment_parent', 'id' => 'comment_ID');
 	/**
 	 * @see Walker::start_lvl()
-	 * @since unknown
+	 * @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.
 	 */
-	function start_lvl(&$output, $depth, $args) {
+	function start_lvl( &$output, $depth = 0, $args = array() ) {
 		$GLOBALS['comment_depth'] = $depth + 1;
 		switch ( $args['style'] ) {
 			case 'div':
 				break;
 		}
 	}
 	/**
 	 * @see Walker::end_lvl()
-	 * @since unknown
+	 * @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'.
 	 */
-	function end_lvl(&$output, $depth, $args) {
+	function end_lvl( &$output, $depth = 0, $args = array() ) {
 		$GLOBALS['comment_depth'] = $depth + 1;
 		switch ( $args['style'] ) {
 			case 'div':
 				break;
 				break;
 		}
 	}
 	/**
+	 * 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
+	 *
+	 */
+	function display_element( $element, &$children_elements, $max_depth, $depth=0, $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 ] );
+		}
+	}
+	/**
 	 * @see Walker::start_el()
-	 * @since unknown
+	 * @since 2.7.0
 	 *
 	 * @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
 	 */
-	function start_el(&$output, $comment, $depth, $args) {
+	function start_el( &$output, $comment, $depth, $args, $id = 0 ) {
 		$depth++;
 		$GLOBALS['comment_depth'] = $depth;
 		if ( !empty($args['callback']) ) {
 			call_user_func($args['callback'], $comment, $args, $depth);
 		<div class="comment-author vcard">
 		<?php if ($args['avatar_size'] != 0) 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 ($comment->comment_approved == '0') : ?>
-		<em><?php _e('Your comment is awaiting moderation.') ?></em>
+		<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 htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ?>"><?php printf(__('%1$s at %2$s'), get_comment_date(),  get_comment_time()) ?></a><?php edit_comment_link(__('(Edit)'),'&nbsp;&nbsp;','') ?></div>
+		<div class="comment-meta commentmetadata"><a href="<?php echo htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ?>">
+			<?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() ?>
 		<div class="reply">
 		<?php comment_reply_link(array_merge( $args, array('add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth']))) ?>
 <?php
 	}
 	/**
 	 * @see Walker::end_el()
-	 * @since unknown
+	 * @since 2.7.0
 	 *
 	 * @param string $output Passed by reference. Used to append additional content.
 	 * @param object $comment
 	 * @param int $depth Depth of comment.
 	 * @param array $args
 	 */
-	function end_el(&$output, $comment, $depth, $args) {
+	function end_el(&$output, $comment, $depth = 0, $args = array() ) {
 		if ( !empty($args['end-callback']) ) {
 			call_user_func($args['end-callback'], $comment, $args, $depth);
 			return;
 		}
 		if ( 'div' == $args['style'] )
 *
 * @since 2.7.0
 * @uses Walker_Comment
 *
 * @param string|array $args Formatting options
-* @param array $comments Optional array of comment objects.  Defaults to $wp_query->comments
+* @param array $comments Optional array of comment objects. Defaults to $wp_query->comments
 */
 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;
 	if ( '' === $r['page'] ) {
 		if ( empty($overridden_cpage) ) {
 			$r['page'] = get_query_var('cpage');
 		} else {
-			$threaded = ( -1 == $r['max_depth'] ) ? false : true;
+			$threaded = ( -1 != $r['max_depth'] );
 			$r['page'] = ( 'newest' == get_option('default_comments_page') ) ? get_comment_pages_count($_comments, $r['per_page'], $threaded) : 1;
 			set_query_var( 'cpage', $r['page'] );
 		}
 	}
 	// Validation check
 	$r['page'] = intval($r['page']);
 	if ( 0 == $r['page'] && 0 != $r['per_page'] )
 		$r['page'] = 1;
 	if ( null === $r['reverse_top_level'] )
-		$r['reverse_top_level'] = ( 'desc' == get_option('comment_order') ) ? TRUE : FALSE;
+		$r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
 	extract( $r, EXTR_SKIP );
 	if ( empty($walker) )
 		$walker = new Walker_Comment;
 	$wp_query->max_num_comment_pages = $walker->max_pages;
 	$in_comment_loop = false;
 }
-?>
+/**
+* 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
+* 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
+* in the array of fields.
+*
+* @since 3.0.0
+* @param array $args Options for strings, fields etc in the form
+* @param mixed $post_id Post ID to generate the form for, uses the current post if null
+* @return void
+*/
+function comment_form( $args = array(), $post_id = null ) {
+	global $id;
+	if ( null === $post_id )
+		$post_id = $id;
+	else
+		$id = $post_id;
+	$commenter = wp_get_current_commenter();
+	$user = wp_get_current_user();
+	$user_identity = $user->exists() ? $user->display_name : '';
+	$req = get_option( 'require_name_email' );
+	$aria_req = ( $req ? " aria-required='true'" : '' );
+	$fields =  array(
+		'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . '</label> ' . ( $req ? '<span class="required">*</span>' : '' ) .
+		            '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30"' . $aria_req . ' /></p>',
+		'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . '</label> ' . ( $req ? '<span class="required">*</span>' : '' ) .
+		            '<input id="email" name="email" type="text" value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30"' . $aria_req . ' /></p>',
+		'url'    => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label>' .
+		            '<input id="url" name="url" type="text" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" /></p>',
+	);
+	$required_text = sprintf( ' ' . __('Required fields are marked %s'), '<span class="required">*</span>' );
+	$defaults = array(
+		'fields'               => apply_filters( 'comment_form_default_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-required="true"></textarea></p>',
+		'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>',
+		'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>' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
+		'comment_notes_before' => '<p class="comment-notes">' . __( 'Your email address will not be published.' ) . ( $req ? $required_text : '' ) . '</p>',
+		'comment_notes_after'  => '<p class="form-allowed-tags">' . sprintf( __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes: %s' ), ' <code>' . allowed_tags() . '</code>' ) . '</p>',
+		'id_form'              => 'commentform',
+		'id_submit'            => 'submit',
+		'title_reply'          => __( 'Leave a Reply' ),
+		'title_reply_to'       => __( 'Leave a Reply to %s' ),
+		'cancel_reply_link'    => __( 'Cancel reply' ),
+		'label_submit'         => __( 'Post Comment' ),
+	);
+	$args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );
+	?>
+		<?php if ( comments_open( $post_id ) ) : ?>
+			<?php do_action( 'comment_form_before' ); ?>
+			<div id="respond">
+				<h3 id="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 if ( get_option( 'comment_registration' ) && !is_user_logged_in() ) : ?>
+					<?php echo $args['must_log_in']; ?>
+					<?php do_action( 'comment_form_must_log_in_after' ); ?>
+				<?php else : ?>
+					<form action="<?php echo site_url( '/wp-comments-post.php' ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>">
+						<?php do_action( 'comment_form_top' ); ?>
+						<?php if ( is_user_logged_in() ) : ?>
+							<?php echo apply_filters( 'comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity ); ?>
+							<?php do_action( 'comment_form_logged_in_after', $commenter, $user_identity ); ?>
+						<?php else : ?>
+							<?php echo $args['comment_notes_before']; ?>
+							<?php
+							do_action( 'comment_form_before_fields' );
+							foreach ( (array) $args['fields'] as $name => $field ) {
+								echo apply_filters( "comment_form_field_{$name}", $field ) . "\n";
+							}
+							do_action( 'comment_form_after_fields' );
+							?>
+						<?php endif; ?>
+						<?php echo apply_filters( 'comment_form_field_comment', $args['comment_field'] ); ?>
+						<?php echo $args['comment_notes_after']; ?>
+						<p class="form-submit">
+							<input name="submit" type="submit" id="<?php echo esc_attr( $args['id_submit'] ); ?>" value="<?php echo esc_attr( $args['label_submit'] ); ?>" />
+							<?php comment_id_fields( $post_id ); ?>
+						</p>
+						<?php do_action( 'comment_form', $post_id ); ?>
+					</form>
+				<?php endif; ?>
+			</div><!-- #respond -->
+			<?php do_action( 'comment_form_after' ); ?>
+		<?php else : ?>
+			<?php do_action( 'comment_form_comments_closed' ); ?>
+		<?php endif; ?>
+	<?php
+}

changeset 194	32102edaa81b
parent 136	bde1974c263b
child 204	09a1c134465b