Ticket #17590: 17590.patch

wp-includes/post-template.php

@@ -825 +825 @@
                         $output .= '<li class="pagenav">' . $r['title_li'] . '<ul>';
 
                 global $wp_query;
-                if ( is_page() || is_attachment() || $wp_query->is_posts_page )
+                if ( ( is_singular() && 'post' != $wp_query->get( 'post_type' ) ) || $wp_query->is_posts_page )
                         $current_page = $wp_query->get_queried_object_id();
                 $output .= walk_page_tree($pages, $r['depth'], $current_page, $r);