<!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>[26353] trunk/src/wp-includes/comment-template.php: Add echo arguments to wp_list_comments() and Walker_Comment, allowing non-echo usage.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26353">26353</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-11-24 14:58:48 +0000 (Sun, 24 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add echo arguments to wp_list_comments() and Walker_Comment, allowing non-echo usage.
props mikelittle.
fixes <a href="http://core.trac.wordpress.org/ticket/10948">#10948</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/comment-template.php (26352 => 26353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/comment-template.php 2013-11-24 14:04:50 UTC (rev 26352)
+++ trunk/src/wp-includes/comment-template.php 2013-11-24 14:58:48 UTC (rev 26353)
</span><span class="lines">@@ -1517,11 +1517,11 @@
</span><span class="cx"> case 'div':
</span><span class="cx"> break;
</span><span class="cx"> case 'ol':
</span><del>- echo '<ol class="children">' . "\n";
</del><ins>+ $output .= '<ol class="children">' . "\n";
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> case 'ul':
</span><del>- echo '<ul class="children">' . "\n";
</del><ins>+ $output .= '<ul class="children">' . "\n";
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1544,11 +1544,11 @@
</span><span class="cx"> case 'div':
</span><span class="cx"> break;
</span><span class="cx"> case 'ol':
</span><del>- echo "</ol><!-- .children -->\n";
</del><ins>+ $output .= "</ol><!-- .children -->\n";
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> case 'ul':
</span><del>- echo "</ul><!-- .children -->\n";
</del><ins>+ $output .= "</ul><!-- .children -->\n";
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1623,16 +1623,24 @@
</span><span class="cx"> $GLOBALS['comment'] = $comment;
</span><span class="cx">
</span><span class="cx"> if ( !empty( $args['callback'] ) ) {
</span><ins>+ ob_start();
</ins><span class="cx"> call_user_func( $args['callback'], $comment, $args, $depth );
</span><ins>+ $output .= ob_get_clean();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ( 'pingback' == $comment->comment_type || 'trackback' == $comment->comment_type ) && $args['short_ping'] ) {
</span><ins>+ ob_start();
</ins><span class="cx"> $this->ping( $comment, $depth, $args );
</span><ins>+ $output .= ob_get_clean();
</ins><span class="cx"> } elseif ( 'html5' === $args['format'] ) {
</span><ins>+ ob_start();
</ins><span class="cx"> $this->html5_comment( $comment, $depth, $args );
</span><ins>+ $output .= ob_get_clean();
</ins><span class="cx"> } else {
</span><ins>+ ob_start();
</ins><span class="cx"> $this->comment( $comment, $depth, $args );
</span><ins>+ $output .= ob_get_clean();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1650,13 +1658,15 @@
</span><span class="cx"> */
</span><span class="cx"> function end_el( &$output, $comment, $depth = 0, $args = array() ) {
</span><span class="cx"> if ( !empty( $args['end-callback'] ) ) {
</span><ins>+ ob_start();
</ins><span class="cx"> call_user_func( $args['end-callback'], $comment, $args, $depth );
</span><ins>+ $output .= ob_get_clean();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if ( 'div' == $args['style'] )
</span><del>- echo "</div><!-- #comment-## -->\n";
</del><ins>+ $output .= "</div><!-- #comment-## -->\n";
</ins><span class="cx"> else
</span><del>- echo "</li><!-- #comment-## -->\n";
</del><ins>+ $output .= "</li><!-- #comment-## -->\n";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1801,6 +1811,7 @@
</span><span class="cx"> * @type string 'format' How to format the comments list.
</span><span class="cx"> * Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'.
</span><span class="cx"> * @type bool 'short_ping' Whether to output short pings. Default false.
</span><ins>+ * @type bool 'echo' Whether to echo the output or return it. Default true.
</ins><span class="cx"> * }
</span><span class="cx"> * @param array $comments Optional. Array of comment objects. @see WP_Query->comments
</span><span class="cx"> */
</span><span class="lines">@@ -1826,6 +1837,7 @@
</span><span class="cx"> 'reverse_children' => '',
</span><span class="cx"> 'format' => current_theme_supports( 'html5', 'comment-list' ) ? 'html5' : 'xhtml',
</span><span class="cx"> 'short_ping' => false,
</span><ins>+ 'echo' => true,
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="lines">@@ -1894,10 +1906,15 @@
</span><span class="cx"> if ( empty($walker) )
</span><span class="cx"> $walker = new Walker_Comment;
</span><span class="cx">
</span><del>- $walker->paged_walk($_comments, $max_depth, $page, $per_page, $r);
</del><ins>+ $output = $walker->paged_walk($_comments, $max_depth, $page, $per_page, $r);
</ins><span class="cx"> $wp_query->max_num_comment_pages = $walker->max_pages;
</span><span class="cx">
</span><span class="cx"> $in_comment_loop = false;
</span><ins>+
+ if ( $r['echo'] )
+ echo $output;
+ else
+ return $output;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>