<!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>[28824] trunk: Ensure that a `has_children` parameter is given to `Walker::start_el()`.</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/28824">28824</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-06-24 17:05:56 +0000 (Tue, 24 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure that a `has_children` parameter is given to `Walker::start_el()`.
Adds unit tests.
Props scribu, obenland.
Fixes <a href="http://core.trac.wordpress.org/ticket/14041">#14041</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpwalkerphp">trunk/src/wp-includes/class-wp-walker.php</a></li>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestscommentwalkerphp">trunk/tests/phpunit/tests/comment/walker.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpwalkerphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-walker.php (28823 => 28824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-walker.php 2014-06-24 16:05:54 UTC (rev 28823)
+++ trunk/src/wp-includes/class-wp-walker.php 2014-06-24 17:05:56 UTC (rev 28824)
</span><span class="lines">@@ -40,6 +40,15 @@
</span><span class="cx"> protected $max_pages = 1;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Wether the current element has children or not. To be used in start_el()
+ *
+ * @since 4.0.0
+ * @var bool
+ * @access protected
+ */
+ protected $has_children;
+
+ /**
</ins><span class="cx"> * Make private properties readable for backwards compatibility
</span><span class="cx"> *
</span><span class="cx"> * @since 4.0.0
</span><span class="lines">@@ -172,15 +181,17 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $id_field = $this->db_fields['id'];
</span><ins>+ $id = $element->$id_field;
</ins><span class="cx">
</span><span class="cx"> //display this element
</span><del>- if ( isset( $args[0] ) && is_array( $args[0] ) )
- $args[0]['has_children'] = ! empty( $children_elements[$element->$id_field] );
</del><ins>+ $this->has_children = ! empty( $children_elements[ $id ] );
+ if ( isset( $args[0] ) && is_array( $args[0] ) ) {
+ $args[0]['has_children'] = $this->has_children; // Backwards compatibility.
+ }
+
</ins><span class="cx"> $cb_args = array_merge( array(&$output, $element, $depth), $args);
</span><span class="cx"> call_user_func_array(array($this, 'start_el'), $cb_args);
</span><span class="cx">
</span><del>- $id = $element->$id_field;
-
</del><span class="cx"> // descend only when the depth is right and there are childrens for this element
</span><span class="cx"> if ( ($max_depth == 0 || $max_depth > $depth+1 ) && isset( $children_elements[$id]) ) {
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/comment-template.php (28823 => 28824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/comment-template.php 2014-06-24 16:05:54 UTC (rev 28823)
+++ trunk/src/wp-includes/comment-template.php 2014-06-24 17:05:56 UTC (rev 28824)
</span><span class="lines">@@ -1784,7 +1784,7 @@
</span><span class="cx"> $add_below = 'div-comment';
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><del>- <<?php echo $tag; ?> <?php comment_class( empty( $args['has_children'] ) ? '' : 'parent' ); ?> id="comment-<?php comment_ID(); ?>">
</del><ins>+ <<?php echo $tag; ?> <?php comment_class( $this->has_children ? 'parent' : '' ); ?> id="comment-<?php comment_ID(); ?>">
</ins><span class="cx"> <?php if ( 'div' != $args['style'] ) : ?>
</span><span class="cx"> <div id="div-comment-<?php comment_ID(); ?>" class="comment-body">
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -1830,7 +1830,7 @@
</span><span class="cx"> protected function html5_comment( $comment, $depth, $args ) {
</span><span class="cx"> $tag = ( 'div' === $args['style'] ) ? 'div' : 'li';
</span><span class="cx"> ?>
</span><del>- <<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( empty( $args['has_children'] ) ? '' : 'parent' ); ?>>
</del><ins>+ <<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '' ); ?>>
</ins><span class="cx"> <article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
</span><span class="cx"> <footer class="comment-meta">
</span><span class="cx"> <div class="comment-author vcard">
</span></span></pre></div>
<a id="trunktestsphpunittestscommentwalkerphp"></a>
<div class="addfile"><h4>Added: trunk/tests/phpunit/tests/comment/walker.php (0 => 28824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/comment/walker.php (rev 0)
+++ trunk/tests/phpunit/tests/comment/walker.php 2014-06-24 17:05:56 UTC (rev 28824)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+<?php
+
+/**
+ * @group comment
+ */
+class Tests_Comment_Walker extends WP_UnitTestCase {
+
+ function setUp() {
+ parent::setUp();
+
+ $this->post_id = $this->factory->post->create();
+ }
+
+ /**
+ * @ticket 14041
+ */
+ function test_has_children() {
+ $comment_parent = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
+ $comment_child = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_parent' => $comment_parent ) );
+ $comment_parent = get_comment( $comment_parent );
+ $comment_child = get_comment( $comment_child );
+
+ $comment_walker = new Walker_Comment();
+ $comment_callback = new Comment_Callback_Test( $this, $comment_walker );
+
+ wp_list_comments( array( 'callback' => array( $comment_callback, 'comment' ), 'walker' => $comment_walker, 'echo' => false ), array( $comment_parent, $comment_child ) );
+ wp_list_comments( array( 'callback' => array( $comment_callback, 'comment' ), 'walker' => $comment_walker, 'echo' => false ), array( $comment_child, $comment_parent ) );
+ }
+}
+
+class Comment_Callback_Test {
+ public function __construct( Tests_Comment_Walker $test_walker, Walker_Comment $walker ) {
+ $this->test_walker = $test_walker;
+ $this->walker = $walker;
+ }
+
+ public function comment( $comment, $args, $depth ) {
+ if ( 1 == $depth ) {
+ $this->test_walker->assertTrue( $this->walker->has_children );
+ $this->test_walker->assertTrue( $args['has_children'] ); // Back compat
+ }
+
+ else if ( 2 == $depth ) {
+ $this->test_walker->assertFalse( $this->walker->has_children );
+ $this->test_walker->assertFalse( $args['has_children'] ); // Back compat
+ }
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>