From 72e9496bfc2f7a962cf4f428ccab25c7a0175aaa Mon Sep 17 00:00:00 2001 From: donncha Date: Tue, 16 Jan 2007 21:27:04 +0000 Subject: WP Merge to rev 4753 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@849 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-includes/post-template.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'wp-includes/post-template.php') diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index 5ecebd9..4951baa 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -289,7 +289,7 @@ function wp_list_pages($args = '') { global $wp_query; $current_page = $wp_query->get_queried_object_id(); - $output .= walk_page_tree($pages, $r['depth'], $current_page, $r['show_date'], $r['date_format']); + $output .= walk_page_tree($pages, $r['depth'], $current_page, $r); if ( $r['title_li'] ) $output .= ''; @@ -368,8 +368,9 @@ function get_attachment_icon_src( $id = 0, $fullsize = false ) { $src_file = $icon_dir . '/' . basename($src); } - if ( !isset($src) ) + if ( !isset($src) || !$src ) return false; + return array($src, $src_file); } -- cgit