comment functions updated to current 2010, now working

This commit is contained in:
Jacob Haddon 2021-07-26 08:43:56 -04:00
parent 3052a115a1
commit 16c13dae1d

View File

@ -156,59 +156,92 @@ function melville_remove_gallery_css( $css ) {
add_filter( 'gallery_style', 'melville_remove_gallery_css' ); add_filter( 'gallery_style', 'melville_remove_gallery_css' );
if ( ! function_exists( 'melville_comment' ) ) : if ( ! function_exists( 'melville_comment' ) ) :
/** /**
* Template for comments and pingbacks. * Template for comments and pingbacks.
* *
* To override this walker in a child theme without modifying the comments template * To override this walker in a child theme without modifying the comments template
* simply create your own twentyten_comment(), and that function will be used instead. * simply create your own twentyten_comment(), and that function will be used instead.
* *
* Used as a callback by wp_list_comments() for displaying the comments. * Used as a callback by wp_list_comments() for displaying the comments.
* *
* @since Twenty Ten 1.0 * @since Twenty Ten 1.0
*/ *
function melville_comment( $comment, $args, $depth ) { * @param WP_Comment $comment The comment object.
$GLOBALS['comment'] = $comment; * @param array $args An array of arguments. @see get_comment_reply_link()
switch ( $comment->comment_type ) : * @param int $depth The depth of the comment.
case '' : */
?> function melville_comment( $comment, $args, $depth ) {
<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>"> $GLOBALS['comment'] = $comment;
switch ( $comment->comment_type ) :
case '':
case 'comment':
?>
<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
<div id="comment-<?php comment_ID(); ?>"> <div id="comment-<?php comment_ID(); ?>">
<div class="comment-author vcard"> <div class="comment-author vcard">
<?php echo get_avatar( $comment, 40 ); ?> <?php echo get_avatar( $comment, 40 ); ?>
<?php printf( __( '%s <span class="says">said:</span>', 'twentyten' ), sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ) ); ?> <?php
</div><!-- .comment-author .vcard --> /* translators: %s: Author display name. */
<?php if ( $comment->comment_approved == '0' ) : ?> printf( __( '%s <span class="says">says:</span>', 'twentyten' ), sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ) );
<em><?php _e( 'Your comment is awaiting moderation.', 'twentyten' ); ?></em> ?>
</div><!-- .comment-author .vcard -->
<?php
$commenter = wp_get_current_commenter();
if ( $commenter['comment_author_email'] ) {
$moderation_note = __( 'Your comment is awaiting moderation.', 'twentyten' );
} else {
$moderation_note = __( 'Your comment is awaiting moderation. This is a preview; your comment will be visible after it has been approved.', 'twentyten' );
}
?>
<?php if ( '0' == $comment->comment_approved ) : ?>
<em class="comment-awaiting-moderation"><?php echo $moderation_note; ?></em>
<br /> <br />
<?php endif; ?> <?php endif; ?>
<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>"> <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>">
<?php <?php
/* translators: 1: date, 2: time */ /* translators: 1: Date, 2: Time. */
printf( __( '%1$s', 'twentyten' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' ); printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(), get_comment_time() );
?> ?>
</div><!-- .comment-meta .commentmetadata --> </a>
<?php
edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' );
?>
</div><!-- .comment-meta .commentmetadata -->
<div class="comment-body"><?php comment_text(); ?></div> <div class="comment-body"><?php comment_text(); ?></div>
<div class="reply"> <div class="reply">
<?php comment_reply_link( array_merge( $args, array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?> <?php
</div><!-- .reply --> comment_reply_link(
</div><!-- #comment-## --> array_merge(
$args,
array(
'depth' => $depth,
'max_depth' => $args['max_depth'],
)
)
);
?>
</div><!-- .reply -->
</div><!-- #comment-## -->
<?php <?php
break; break;
case 'pingback' : case 'pingback':
case 'trackback' : case 'trackback':
?> ?>
<li class="post pingback"> <li class="post pingback">
<p><?php _e( 'Pingback:', 'twentyten' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __('(Edit)', 'twentyten'), ' ' ); ?></p> <p><?php _e( 'Pingback:', 'twentyten' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' ); ?></p>
<?php <?php
break; break;
endswitch; endswitch;
} }
endif; endif;
/** /**
* Removes the default styles that are packaged with the Recent Comments widget. * Removes the default styles that are packaged with the Recent Comments widget.
* *