vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-01 11:14:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Adds unit tests.

Props scribu, obenland.
Fixes #14041.


git-svn-id: https://develop.svn.wordpress.org/trunk@28824 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
2014-06-24 17:05:56 +00:00
parent 94be170877
commit 73fe9d548b
3 changed files with 65 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,6 +39,15 @@ class Walker {
*/
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
*
@@ -172,15 +181,17 @@ class Walker {
return;
$id_field = $this->db_fields['id'];
$id = $element->$id_field;
//display this element
if ( isset( $args[0] ) && is_array( $args[0] ) )
$args[0]['has_children'] = ! empty( $children_elements[$element->$id_field] );
$this->has_children = ! empty( $children_elements[ $id ] );
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);
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
if ( ($max_depth == 0 || $max_depth > $depth+1 ) && isset( $children_elements[$id]) ) {