$classes = array_merge($classes, $class);
}
+ $classes = array_map('esc_attr', $classes);
+
return apply_filters('comment_class', $classes, $class, $comment_id, $post_id);
}
else
$count = $post->comment_count;
- return apply_filters('get_comments_number', $count);
+ return apply_filters('get_comments_number', $count, $post_id);
}
/**
*/
function get_comment_time( $d = '', $gmt = false, $translate = true ) {
global $comment;
- $comment_date = $gmt? $comment->comment_date_gmt : $comment->comment_date;
+ $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);
- return apply_filters('get_comment_time', $date, $d, $gmt);
+ return apply_filters('get_comment_time', $date, $d, $gmt, $translate);
}
/**
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) )
+ if ( !(is_single() || is_page() || $withcomments) || empty($post) )
return;
if ( empty($file) )
/**
* The email address of the current comment author escaped for use in attributes.
- */
+ */
$comment_author_email = $commenter['comment_author_email']; // Escaped by sanitize_comment_cookies()
/**
* The url of the current comment author escaped for use in attributes.
- */
+ */
$comment_author_url = esc_url($commenter['comment_author_url']);
/** @todo Use API instead of SELECTs. */
$number = get_comments_number( $id );
if ( 0 == $number && !comments_open() && !pings_open() ) {
- echo '<span' . ((!empty($css_class)) ? ' class="' . $css_class . '"' : '') . '>' . $none . '</span>';
+ echo '<span' . ((!empty($css_class)) ? ' class="' . esc_attr( $css_class ) . '"' : '') . '>' . $none . '</span>';
return;
}
if ( !empty( $css_class ) ) {
echo ' class="'.$css_class.'" ';
}
- $title = esc_attr( get_the_title() );
+ $title = the_title_attribute( 'echo=0' );
echo apply_filters( 'comments_popup_link_attributes', '' );
- echo ' title="' . sprintf( __('Comment on %s'), $title ) . '">';
+ echo ' title="' . esc_attr( sprintf( __('Comment on %s'), $title ) ) . '">';
comments_number( $zero, $one, $more, $number );
echo '</a>';
}
}
?>
<<?php echo $tag ?> <?php comment_class(empty( $args['has_children'] ) ? '' : 'parent') ?> id="comment-<?php comment_ID() ?>">
- <?php if ( 'ul' == $args['style'] ) : ?>
+ <?php if ( 'div' != $args['style'] ) : ?>
<div id="div-comment-<?php comment_ID() ?>" class="comment-body">
<?php endif; ?>
<div class="comment-author vcard">
<div class="reply">
<?php comment_reply_link(array_merge( $args, array('add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth']))) ?>
</div>
- <?php if ( 'ul' == $args['style'] ) : ?>
+ <?php if ( 'div' != $args['style'] ) : ?>
</div>
<?php endif; ?>
<?php