WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@450 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 3 insertions, 1 deletions

diff --git a/wp-inst/wp-includes/template-functions-post.php b/wp-inst/wp-includes/template-functions-post.php
index e356aeb..be4d977 100644
--- a/wp-inst/wp-includes/template-functions-post.php
+++ b/wp-inst/wp-includes/template-functions-post.php
@@ -283,7 +283,6 @@ function &get_page_children($page_id, $pages) {
 				$page_list = array_merge($page_list, $children);
 		}
 	}
-
 	return $page_list;
 }
 
@@ -403,6 +402,9 @@ function _page_level_out($parent, $page_tree, $args, $depth = 0, $echo = true) {
 		$indent = str_repeat("\t", $depth);
 		//$indent = join('', array_fill(0,$depth,"\t"));
 
+	if ( !is_array($page_tree[$parent]['children']) )
+		return false;
+
 	foreach ( $page_tree[$parent]['children'] as $page_id ) {
 		$cur_page = $page_tree[$page_id];
 		$title = $cur_page['title'];