X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..a6f44f0edcda2471c5a33e4156c1c9488c7f3210:/wp-includes/comment-template.php
diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 4bc9edb8..afbee05f 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -55,7 +55,7 @@ function comment_author( $comment_ID = 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.
+ * @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( $comment_ID = 0 ) {
@@ -141,7 +141,7 @@ function get_comment_author_email_link($linktext='', $before='', $after='') {
* @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.
+ * @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( $comment_ID = 0 ) {
@@ -162,7 +162,7 @@ function get_comment_author_link( $comment_ID = 0 ) {
* @since 0.71
* @see get_comment_author_link() Echoes result
*
- * @param int The ID of the comment for which to print the author's link. Optional.
+ * @param int $comment_ID The ID of the comment for which to print the author's link. Optional.
*/
function comment_author_link( $comment_ID = 0 ) {
echo get_comment_author_link( $comment_ID );
@@ -189,7 +189,7 @@ function get_comment_author_IP( $comment_ID = 0 ) {
* @since 0.71
* @see get_comment_author_IP() Echoes Result
*
- * @param int $comment_ID The ID of the comment for which to print the author's IP address. Optional.
+ * @param int $comment_ID The ID of the comment for which to print the author's IP address. Optional.
*/
function comment_author_IP( $comment_ID = 0 ) {
echo get_comment_author_IP( $comment_ID );
@@ -201,7 +201,7 @@ function comment_author_IP( $comment_ID = 0 ) {
* @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.
+ * @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( $comment_ID = 0 ) {
@@ -362,7 +362,7 @@ function get_comment_class( $class = '', $comment_id = null, $post_id = null ) {
* 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)
@@ -384,7 +384,7 @@ function get_comment_date( $d = '', $comment_ID = 0 ) {
* @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.
+ * @param int $comment_ID The ID of the comment for which to print the date. Optional.
*/
function comment_date( $d = '', $comment_ID = 0 ) {
echo get_comment_date( $d, $comment_ID );
@@ -393,8 +393,8 @@ function comment_date( $d = '', $comment_ID = 0 ) {
/**
* Retrieve the excerpt of the current comment.
*
- * Will cut each word and only output the first 20 words with '...' at the end.
- * If the word count is less than 20, then no truncating is done and no '...'
+ * Will cut each word and only output the first 20 words with '…' at the end.
+ * If the word count is less than 20, then no truncating is done and no '…'
* will appear.
*
* @since 1.5.0
@@ -419,7 +419,7 @@ function get_comment_excerpt( $comment_ID = 0 ) {
for ($i=0; $i<$k; $i++) {
$excerpt .= $blah[$i] . ' ';
}
- $excerpt .= ($use_dotdotdot) ? '...' : '';
+ $excerpt .= ($use_dotdotdot) ? '…' : '';
return apply_filters('get_comment_excerpt', $excerpt);
}
@@ -516,7 +516,7 @@ function get_comment_link( $comment = null, $args = array() ) {
* @return string The link to the comments
*/
function get_comments_link($post_id = 0) {
- return get_permalink($post_id) . '#comments';
+ return apply_filters( 'get_comments_link', get_permalink( $post_id ) . '#comments', $post_id );
}
/**
@@ -532,7 +532,7 @@ function comments_link( $deprecated = '', $deprecated_2 = '' ) {
_deprecated_argument( __FUNCTION__, '0.72' );
if ( !empty( $deprecated_2 ) )
_deprecated_argument( __FUNCTION__, '1.3' );
- echo get_comments_link();
+ echo esc_url( get_comments_link() );
}
/**
@@ -545,11 +545,10 @@ function comments_link( $deprecated = '', $deprecated_2 = '' ) {
* @return int The number of comments a post has
*/
function get_comments_number( $post_id = 0 ) {
- global $id;
- $post_id = (int) $post_id;
+ $post_id = absint( $post_id );
if ( !$post_id )
- $post_id = (int) $id;
+ $post_id = get_the_ID();
$post = get_post($post_id);
if ( ! isset($post->comment_count) )
@@ -564,7 +563,6 @@ function get_comments_number( $post_id = 0 ) {
* 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
@@ -573,12 +571,10 @@ function get_comments_number( $post_id = 0 ) {
* @param string $deprecated Not used.
*/
function comments_number( $zero = false, $one = false, $more = false, $deprecated = '' ) {
- global $id;
-
if ( !empty( $deprecated ) )
_deprecated_argument( __FUNCTION__, '1.3' );
- $number = get_comments_number($id);
+ $number = get_comments_number();
if ( $number > 1 )
$output = str_replace('%', number_format_i18n($number), ( false === $more ) ? __('% Comments') : $more);
@@ -601,7 +597,7 @@ function comments_number( $zero = false, $one = false, $more = false, $deprecate
*/
function get_comment_text( $comment_ID = 0 ) {
$comment = get_comment( $comment_ID );
- return apply_filters('get_comment_text', $comment->comment_content);
+ return apply_filters( 'get_comment_text', $comment->comment_content, $comment );
}
/**
@@ -614,7 +610,8 @@ function get_comment_text( $comment_ID = 0 ) {
* @param int $comment_ID The ID of the comment for which to print the text. Optional.
*/
function comment_text( $comment_ID = 0 ) {
- echo apply_filters('comment_text', get_comment_text() );
+ $comment = get_comment( $comment_ID );
+ echo apply_filters( 'comment_text', get_comment_text( $comment_ID ), $comment );
}
/**
@@ -678,9 +675,9 @@ function get_comment_type( $comment_ID = 0 ) {
* @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 === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
- if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
+ if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
+ if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
+ if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
$type = get_comment_type();
switch( $type ) {
case 'trackback' :
@@ -703,16 +700,14 @@ function comment_type($commenttxt = false, $trackbacktxt = false, $pingbacktxt =
*
* @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);
}
@@ -735,6 +730,36 @@ function trackback_url( $deprecated_echo = true ) {
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 = '' ) {
+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '2.5' );
+
+ if ( false !== stripos($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator') )
+ return;
+
+ echo '
+ \n";
+ echo '';
+}
+
/**
* Whether the current post is open for comments.
*
@@ -744,7 +769,7 @@ function trackback_url( $deprecated_echo = true ) {
* @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);
@@ -761,7 +786,7 @@ function comments_open( $post_id=NULL ) {
* @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);
@@ -785,14 +810,13 @@ function pings_open( $post_id = NULL ) {
* @uses $post Gets the ID of the current post for the token
*/
function wp_comment_form_unfiltered_html_nonce() {
- global $post;
+ $post = get_post();
+ $post_id = $post ? $post->ID : 0;
- $post_id = 0;
- if ( !empty($post) )
- $post_id = $post->ID;
-
- if ( current_user_can('unfiltered_html') )
- wp_nonce_field('unfiltered-html-comment_' . $post_id, '_wp_unfiltered_html_comment', false);
+ if ( current_user_can( 'unfiltered_html' ) ) {
+ wp_nonce_field( 'unfiltered-html-comment_' . $post_id, '_wp_unfiltered_html_comment_disabled', false );
+ echo "\n";
+ }
}
/**
@@ -807,14 +831,13 @@ function wp_comment_form_unfiltered_html_nonce() {
*
* 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.
*
@@ -871,26 +894,26 @@ function comments_template( $file = '/comments.php', $separate_comments = false
update_comment_cache($wp_query->comments);
if ( $separate_comments ) {
- $wp_query->comments_by_type = &separate_comments($comments);
+ $wp_query->comments_by_type = separate_comments($comments);
$comments_by_type = &$wp_query->comments_by_type;
}
- $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)
+ if ( !defined('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 // Backward compat code will be removed in a future release
- require( WPINC . '/theme-compat/comments.php');
+ require( ABSPATH . WPINC . '/theme-compat/comments.php');
}
/**
@@ -931,7 +954,6 @@ function comments_popup_script($width=400, $height=400, $file='') {
* lists of posts
*
* @since 0.71
- * @uses $id
* @uses $wpcommentspopupfile
* @uses $wpcommentsjavascript
* @uses $post
@@ -944,12 +966,14 @@ function comments_popup_script($width=400, $height=400, $file='') {
* @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;
+ global $wpcommentspopupfile, $wpcommentsjavascript;
+
+ $id = get_the_ID();
- if ( false === $zero ) $zero = __( 'No Comments' );
- if ( false === $one ) $one = __( '1 Comment' );
- if ( false === $more ) $more = __( '% Comments' );
- if ( false === $none ) $none = __( 'Comments Off' );
+ if ( false === $zero ) $zero = __( 'No Comments' );
+ if ( false === $one ) $one = __( '1 Comment' );
+ if ( false === $more ) $more = __( '% Comments' );
+ if ( false === $none ) $none = __( 'Comments Off' );
$number = get_comments_number( $id );
@@ -1034,7 +1058,7 @@ function get_comment_reply_link($args = array(), $comment = null, $post = null)
if ( get_option('comment_registration') && !$user_ID )
$link = '';
else
- $link = "";
+ $link = "";
return apply_filters('comment_reply_link', $before . $link . $after, $args, $comment, $post);
}
@@ -1066,7 +1090,7 @@ function comment_reply_link($args = array(), $comment = null, $post = null) {
* @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) {
@@ -1137,8 +1161,9 @@ function cancel_comment_reply_link($text = '') {
*
* @return string Hidden input HTML for replying to comments
*/
-function get_comment_id_fields() {
- global $id;
+function get_comment_id_fields( $id = 0 ) {
+ if ( empty( $id ) )
+ $id = get_the_ID();
$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
$result = "\n";
@@ -1152,8 +1177,8 @@ function get_comment_id_fields() {
* @since 2.7.0
* @see get_comment_id_fields() Echoes result
*/
-function comment_id_fields() {
- echo get_comment_id_fields();
+function comment_id_fields( $id = 0 ) {
+ echo get_comment_id_fields( $id );
}
/**
@@ -1165,7 +1190,7 @@ function comment_id_fields() {
* @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' );
@@ -1187,67 +1212,67 @@ function comment_form_title( $noreplytext = false, $replytext = false, $linktopa
*
* @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;
case 'ol':
- echo "
\n";
+ echo '' . "\n";
break;
default:
case 'ul':
- echo "\n";
+ echo '' . "\n";
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;
case 'ol':
- echo "
\n";
+ echo "
\n";
break;
default:
case 'ul':
- echo "\n";
+ echo "\n";
break;
}
}
@@ -1270,7 +1295,7 @@ class Walker_Comment extends Walker {
* 2.2
*
*/
- function display_element( $element, &$children_elements, $max_depth, $depth=0, $args, &$output ) {
+ function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {
if ( !$element )
return;
@@ -1293,25 +1318,79 @@ class Walker_Comment extends Walker {
/**
* @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 = 0, $args = array(), $id = 0 ) {
$depth++;
$GLOBALS['comment_depth'] = $depth;
+ $GLOBALS['comment'] = $comment;
- if ( !empty($args['callback']) ) {
- call_user_func($args['callback'], $comment, $args, $depth);
+ if ( !empty( $args['callback'] ) ) {
+ call_user_func( $args['callback'], $comment, $args, $depth );
return;
}
- $GLOBALS['comment'] = $comment;
- extract($args, EXTR_SKIP);
+ if ( ( 'pingback' == $comment->comment_type || 'trackback' == $comment->comment_type ) && $args['short_ping'] ) {
+ $this->ping( $comment, $depth, $args );
+ } elseif ( 'html5' === $args['format'] ) {
+ $this->html5_comment( $comment, $depth, $args );
+ } else {
+ $this->comment( $comment, $depth, $args );
+ }
+ }
+
+ /**
+ * @see Walker::end_el()
+ * @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 = 0, $args = array() ) {
+ if ( !empty( $args['end-callback'] ) ) {
+ call_user_func( $args['end-callback'], $comment, $args, $depth );
+ return;
+ }
+ if ( 'div' == $args['style'] )
+ echo "\n";
+ else
+ echo "\n";
+ }
+
+ /**
+ * @since 3.6
+ * @access protected
+ *
+ * @param object $comment
+ * @param int $depth Depth of comment.
+ * @param array $args
+ */
+ protected function ping( $comment, $depth, $args ) {
+ $tag = ( 'div' == $args['style'] ) ? 'div' : 'li';
+?>
+ < id="comment-" >
+
+ ', '' ); ?>
+
+
- < id="comment-">
+ < id="comment-">
-
+
-comment_approved == '0') : ?>
-
+ comment_approved ) : ?>
+
-
+
-
@@ -1352,25 +1431,48 @@ class Walker_Comment extends Walker {
}
/**
- * @see Walker::end_el()
- * @since unknown
+ * @since 3.6
+ * @access protected
*
- * @param string $output Passed by reference. Used to append additional content.
- * @param object $comment
+ * @param object $comment Comment to display.
* @param int $depth Depth of comment.
- * @param array $args
+ * @param array $args Optional args.
*/
- function end_el(&$output, $comment, $depth, $args) {
- if ( !empty($args['end-callback']) ) {
- call_user_func($args['end-callback'], $comment, $args, $depth);
- return;
- }
- if ( 'div' == $args['style'] )
- echo "
\n";
- else
- echo "\n";
+ protected function html5_comment( $comment, $depth, $args ) {
+ $tag = ( 'div' === $args['style'] ) ? 'div' : 'li';
+?>
+ < id="comment-" >
+
+
+
+
+
+
+ 'div-comment', 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
+
+
+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;
@@ -1392,8 +1494,21 @@ function wp_list_comments($args = array(), $comments = null ) {
$comment_alt = $comment_thread_alt = 0;
$comment_depth = 1;
- $defaults = array('walker' => null, 'max_depth' => '', 'style' => 'ul', 'callback' => null, 'end-callback' => null, 'type' => 'all',
- 'page' => '', 'per_page' => '', 'avatar_size' => 32, 'reverse_top_level' => null, 'reverse_children' => '');
+ $defaults = array(
+ 'walker' => null,
+ 'max_depth' => '',
+ 'style' => 'ul',
+ 'callback' => null,
+ 'end-callback' => null,
+ 'type' => 'all',
+ 'page' => '',
+ 'per_page' => '',
+ 'avatar_size' => 32,
+ 'reverse_top_level' => null,
+ 'reverse_children' => '',
+ 'format' => current_theme_supports( 'html5', 'comment-list' ) ? 'html5' : 'xhtml',
+ 'short_ping' => false,
+ );
$r = wp_parse_args( $args, $defaults );
@@ -1403,7 +1518,7 @@ function wp_list_comments($args = array(), $comments = null ) {
if ( empty($comments) )
return;
if ( 'all' != $r['type'] ) {
- $comments_by_type = &separate_comments($comments);
+ $comments_by_type = separate_comments($comments);
if ( empty($comments_by_type[$r['type']]) )
return;
$_comments = $comments_by_type[$r['type']];
@@ -1415,7 +1530,7 @@ function wp_list_comments($args = array(), $comments = null ) {
return;
if ( 'all' != $r['type'] ) {
if ( empty($wp_query->comments_by_type) )
- $wp_query->comments_by_type = &separate_comments($wp_query->comments);
+ $wp_query->comments_by_type = separate_comments($wp_query->comments);
if ( empty($wp_query->comments_by_type[$r['type']]) )
return;
$_comments = $wp_query->comments_by_type[$r['type']];
@@ -1482,32 +1597,37 @@ function wp_list_comments($args = array(), $comments = null ) {
* @return void
*/
function comment_form( $args = array(), $post_id = null ) {
- global $user_identity, $id;
-
if ( null === $post_id )
- $post_id = $id;
+ $post_id = get_the_ID();
else
$id = $post_id;
$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' );
+ $req = get_option( 'require_name_email' );
$aria_req = ( $req ? " aria-required='true'" : '' );
- $fields = array(
- 'author' => '',
- 'email' => '',
- 'url' => '',
+ 'email' => '',
+ 'url' => '',
);
$required_text = sprintf( ' ' . __('Required fields are marked %s'), '
*' );
$defaults = array(
'fields' => apply_filters( 'comment_form_default_fields', $fields ),
- 'comment_field' => '',
- 'must_log_in' => '
' . sprintf( __( 'You must be logged in to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '
',
- 'logged_in_as' => '
' . sprintf( __( 'Logged in as %2$s. Log out?' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '
',
+ 'comment_field' => '',
+ 'must_log_in' => '
' . sprintf( __( 'You must be logged in to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '
',
+ 'logged_in_as' => '
' . sprintf( __( 'Logged in as %2$s. Log out?' ), get_edit_user_link(), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '
',
'comment_notes_before' => '',
'comment_notes_after' => '
' . sprintf( __( 'You may use these HTML tags and attributes: %s' ), ' ' . allowed_tags() . '
' ) . '
',
'id_form' => 'commentform',
@@ -1516,20 +1636,21 @@ function comment_form( $args = array(), $post_id = null ) {
'title_reply_to' => __( 'Leave a Reply to %s' ),
'cancel_reply_link' => __( 'Cancel reply' ),
'label_submit' => __( 'Post Comment' ),
+ 'format' => 'xhtml',
);
$args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );
?>
-
+
-
-
+