WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure that a `has_children` parameter is given to `Walker::start_el()`. 

Adds unit tests.

Props scribu, obenland.
Fixes #14041.

Built from https://develop.svn.wordpress.org/trunk@28824


git-svn-id: http://core.svn.wordpress.org/trunk@28628 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-06-24 17:06:14 +00:00
parent 60285aa687
commit 0ba605c55c
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-includes/class-wp-walker.php
View File

@ -39,6 +39,15 @@ class Walker {
*/ */
protected $max_pages = 1; protected $max_pages = 1;
/**
* 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;
/** /**
* Make private properties readable for backwards compatibility * Make private properties readable for backwards compatibility
* *
@ -172,15 +181,17 @@ class Walker {
return; return;
$id_field = $this->db_fields['id']; $id_field = $this->db_fields['id'];
$id = $element->$id_field;
//display this element //display this element
if ( isset( $args[0] ) && is_array( $args[0] ) ) $this->has_children = ! empty( $children_elements[ $id ] );
$args[0]['has_children'] = ! empty( $children_elements[$element->$id_field] ); if ( isset( $args[0] ) && is_array( $args[0] ) ) {
$args[0]['has_children'] = $this->has_children; // Backwards compatibility.
}
$cb_args = array_merge( array(&$output, $element, $depth), $args); $cb_args = array_merge( array(&$output, $element, $depth), $args);
call_user_func_array(array($this, 'start_el'), $cb_args); call_user_func_array(array($this, 'start_el'), $cb_args);
$id = $element->$id_field;
// descend only when the depth is right and there are childrens for this element // descend only when the depth is right and there are childrens for this element
if ( ($max_depth == 0 || $max_depth > $depth+1 ) && isset( $children_elements[$id]) ) { if ( ($max_depth == 0 || $max_depth > $depth+1 ) && isset( $children_elements[$id]) ) {

4
wp-includes/comment-template.php
View File

@ -1784,7 +1784,7 @@ class Walker_Comment extends Walker {
$add_below = 'div-comment'; $add_below = 'div-comment';
} }
?> ?>
<<?php echo $tag; ?> <?php comment_class( empty( $args['has_children'] ) ? '' : 'parent' ); ?> id="comment-<?php comment_ID(); ?>"> <<?php echo $tag; ?> <?php comment_class( $this->has_children ? 'parent' : '' ); ?> id="comment-<?php comment_ID(); ?>">
<?php if ( 'div' != $args['style'] ) : ?> <?php if ( 'div' != $args['style'] ) : ?>
<div id="div-comment-<?php comment_ID(); ?>" class="comment-body"> <div id="div-comment-<?php comment_ID(); ?>" class="comment-body">
<?php endif; ?> <?php endif; ?>
@ -1830,7 +1830,7 @@ class Walker_Comment extends Walker {
protected function html5_comment( $comment, $depth, $args ) { protected function html5_comment( $comment, $depth, $args ) {
$tag = ( 'div' === $args['style'] ) ? 'div' : 'li'; $tag = ( 'div' === $args['style'] ) ? 'div' : 'li';
?> ?>
<<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( empty( $args['has_children'] ) ? '' : 'parent' ); ?>> <<?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"> <article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
<footer class="comment-meta"> <footer class="comment-meta">
<div class="comment-author vcard"> <div class="comment-author vcard">