`Walker_Comment` should be in its own file. Loaded now via `wp-includes/comment.php`, which makes it 100% BC.
See #33413. Built from https://develop.svn.wordpress.org/trunk@33962 git-svn-id: http://core.svn.wordpress.org/trunk@33931 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor
parent
433c786bde
commit
67f90df6a4
|
|
@ -0,0 +1,352 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Comments API: Walker_Comment class
|
||||||
|
*
|
||||||
|
* @package WordPress
|
||||||
|
* @subpackage Comments
|
||||||
|
* @since 4.4.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* HTML comment list class.
|
||||||
|
*
|
||||||
|
* @uses Walker
|
||||||
|
* @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
|
||||||
|
*
|
||||||
|
* @global int $comment_depth
|
||||||
|
*
|
||||||
|
* @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
|
||||||
|
*
|
||||||
|
* @global int $comment_depth
|
||||||
|
*
|
||||||
|
* @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.
|
||||||
|
*/
|
||||||
|
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()
|
||||||
|
*
|
||||||
|
* @global int $comment_depth
|
||||||
|
* @global object $comment
|
||||||
|
*
|
||||||
|
* @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 WP_Comment $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 WP_Comment $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: comment date, 2: comment time */
|
||||||
|
printf( __( '%1$s at %2$s' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)' ), ' ', '' );
|
||||||
|
?>
|
||||||
|
</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
|
||||||
|
/* translators: 1: comment date, 2: comment time */
|
||||||
|
printf( __( '%1$s at %2$s' ), 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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1680,350 +1680,6 @@ function comment_form_title( $noreplytext = false, $replytext = false, $linktopa
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* HTML comment list class.
|
|
||||||
*
|
|
||||||
* @uses Walker
|
|
||||||
* @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
|
|
||||||
*
|
|
||||||
* @global int $comment_depth
|
|
||||||
*
|
|
||||||
* @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
|
|
||||||
*
|
|
||||||
* @global int $comment_depth
|
|
||||||
*
|
|
||||||
* @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.
|
|
||||||
*/
|
|
||||||
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()
|
|
||||||
*
|
|
||||||
* @global int $comment_depth
|
|
||||||
* @global object $comment
|
|
||||||
*
|
|
||||||
* @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 WP_Comment $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 WP_Comment $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: comment date, 2: comment time */
|
|
||||||
printf( __( '%1$s at %2$s' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)' ), ' ', '' );
|
|
||||||
?>
|
|
||||||
</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
|
|
||||||
/* translators: 1: comment date, 2: comment time */
|
|
||||||
printf( __( '%1$s at %2$s' ), 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.
|
* List comments.
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -13,5 +13,8 @@ require_once( ABSPATH . WPINC . '/class-wp-comment.php' );
|
||||||
/** WP_Comment_Query class */
|
/** WP_Comment_Query class */
|
||||||
require_once( ABSPATH . WPINC . '/class-wp-comment-query.php' );
|
require_once( ABSPATH . WPINC . '/class-wp-comment-query.php' );
|
||||||
|
|
||||||
|
/** Walker_Comment class */
|
||||||
|
require_once( ABSPATH . WPINC . '/class-walker-comment.php' );
|
||||||
|
|
||||||
/** Core comments functionality */
|
/** Core comments functionality */
|
||||||
require_once( ABSPATH . WPINC . '/comment-functions.php' );
|
require_once( ABSPATH . WPINC . '/comment-functions.php' );
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '4.4-alpha-33961';
|
$wp_version = '4.4-alpha-33962';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue