Index: wp-includes/comment-template.php =================================================================== --- wp-includes/comment-template.php (revision 23618) +++ wp-includes/comment-template.php (working copy) @@ -1244,11 +1244,11 @@ case 'div': break; case 'ol': - echo "
    \n"; + echo '
      ' . "\n"; break; default: case 'ul': - echo "
    \n"; + echo "
\n"; break; default: case 'ul': - echo "\n"; + echo "\n"; break; } } @@ -1330,13 +1330,67 @@ $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; } - extract($args, EXTR_SKIP); + if ( ( 'pingback' == $comment->comment_type || 'trackback' == $comment->comment_type ) && $args['short_ping'] ) { + $this->ping( $comment, $depth, $args ); + } elseif ( 'html5' === $args['markup'] ) { + $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-"> -
+
- - %s says:'), get_comment_author_link()) ?> + + %s says:' ), get_comment_author_link() ); ?>
-comment_approved == '0') : ?> - + comment_approved ) : ?> +
- + -
+
- $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth']))) ?> + $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
@@ -1377,25 +1431,48 @@ } /** - * @see Walker::end_el() - * @since 2.7.0 + * @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 = 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"; - } + protected function html5_comment( $comment, $depth, $args ) { + $tag = ( 'div' === $args['style'] ) ? 'div' : 'li'; +?> + < id="comment-" > +
+
+
+ + says:' ), sprintf( '%s', get_comment_author_link() ) ); ?> +
+ +
+ + + + ', '' ); ?> +
+ + comment_approved ) : ?> +

+ +
+
+ +
+ +
+ $depth, 'max_depth' => $args['max_depth'] ) ) ); ?> +
+
+ 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' => '', + 'markup' => '', // 'html5' or empty string + 'short_ping' => false, + ); $r = wp_parse_args( $args, $defaults );