<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[33962] trunk/src/wp-includes: `Walker_Comment` should be in its own file.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/33962">33962</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/33962","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-09 02:40:53 +0000 (Wed, 09 Sep 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>`Walker_Comment` should be in its own file. Loaded now via `wp-includes/comment.php`, which makes it 100% BC.
See <a href="https://core.trac.wordpress.org/ticket/33413">#33413</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswalkercommentphp">trunk/src/wp-includes/class-walker-comment.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswalkercommentphpfromrev33961trunksrcwpincludescommenttemplatephp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/class-walker-comment.php (from rev 33961, trunk/src/wp-includes/comment-template.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-walker-comment.php (rev 0)
+++ trunk/src/wp-includes/class-walker-comment.php 2015-09-09 02:40:53 UTC (rev 33962)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,352 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?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
+ }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludescommenttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment-template.php 2015-09-09 02:33:19 UTC (rev 33961)
+++ trunk/src/wp-includes/comment-template.php 2015-09-09 02:40:53 UTC (rev 33962)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1681,350 +1681,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 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
- }
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * List comments.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Used in the comments.php template to list comments for a particular post.
</span></span></pre></div>
<a id="trunksrcwpincludescommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment.php 2015-09-09 02:33:19 UTC (rev 33961)
+++ trunk/src/wp-includes/comment.php 2015-09-09 02:40:53 UTC (rev 33962)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,5 +13,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** WP_Comment_Query class */
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . WPINC . '/class-wp-comment-query.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** Walker_Comment class */
+require_once( ABSPATH . WPINC . '/class-walker-comment.php' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** Core comments functionality */
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . WPINC . '/comment-functions.php' );
</span></span></pre>
</div>
</div>
</body>
</html>