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

walk_page_tree() fix from Mark J. fixes #2516 

git-svn-id: http://svn.automattic.com/wordpress/trunk@3579 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2006-02-28 21:02:10 +00:00
parent 0c110bc342
commit 5fb29643cb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/functions.php
View File

@ -740,7 +740,7 @@ function walk_page_tree($pages, $to_depth, $start_element_callback, $end_element
foreach ( $pages as $page ) { foreach ( $pages as $page ) {
if ( !empty($previous_page) && ($page->post_parent == $previous_page->ID) ) { if ( !empty($previous_page) && ($page->post_parent == $previous_page->ID) ) {
// Previous page is my parent. Descend a level. // Previous page is my parent. Descend a level.
array_unshift($parents, $page); array_unshift($parents, $previous_page);
$depth++; $depth++;
if ( !$to_depth || ($depth < $to_depth) ) if ( !$to_depth || ($depth < $to_depth) )
if ( !empty($start_level_callback) ) { if ( !empty($start_level_callback) ) {
@ -764,7 +764,7 @@ function walk_page_tree($pages, $to_depth, $start_element_callback, $end_element
} }
} }
while ( $parent = array_shift($parents)) { while ( $parent = array_shift($parents) ) {
$depth--; $depth--;
if ( !$to_depth || ($depth < $to_depth) ) { if ( !$to_depth || ($depth < $to_depth) ) {
if ( !empty($end_level_callback) ) { if ( !empty($end_level_callback) ) {
@ -776,7 +776,7 @@ function walk_page_tree($pages, $to_depth, $start_element_callback, $end_element
$output = call_user_func_array($end_element_callback, $cb_args); $output = call_user_func_array($end_element_callback, $cb_args);
} }
} }
if ( $page->post_parent == $parent->ID ) { if ( $page->post_parent == $parents[0]->ID ) {
break; break;
} }
} }