Ticket #17590: 17590.3.patch

post-template.php

@@ -838 +838 @@
  * @return string HTML content, if not displaying.
  */
 function wp_list_pages($args = '') {
+    global $wp_query;
+    
         $defaults = array(
                 'depth' => 0, 'show_date' => '',
                 'date_format' => get_option('date_format'),
@@ -868 +870 @@
                 if ( $r['title_li'] )
                         $output .= '<li class="pagenav">' . $r['title_li'] . '<ul>';
 
-                global $wp_query;
-                if ( is_page() || is_attachment() || $wp_query->is_posts_page )
+                if ( is_singular() && is_post_type_hierarchical( $wp_query->get( 'post_type' ) ) || is_attachment() || $wp_query->is_posts_page )
                         $current_page = $wp_query->get_queried_object_id();
                 $output .= walk_page_tree($pages, $r['depth'], $current_page, $r);