Ticket #8298: 8298.2.diff

wp-includes/post-template.php

@@ -825 +825 @@
  * @param array|string $args
  */
 function wp_page_menu( $args = array() ) {
-        $defaults = array('sort_column' => 'menu_order, post_title', 'menu_class' => 'menu', 'echo' => true, 'link_before' => '', 'link_after' => '');
+        $defaults = array('sort_column' => 'menu_order, post_title', 'menu_class' => 'menu', 'include' => '', 'exclude' => '', 'echo' => true, 'link_before' => '', 'link_after' => '');
         $args = wp_parse_args( $args, $defaults );
         $args = apply_filters( 'wp_page_menu_args', $args );
 
@@ -843 +843 @@
                 if ( is_front_page() && !is_paged() )
                         $class = 'class="current_page_item"';
                 $menu .= '<li ' . $class . '><a href="' . home_url( '/' ) . '" title="' . esc_attr($text) . '">' . $args['link_before'] . $text . $args['link_after'] . '</a></li>';
+                
+                // Because include overrides subpages, we need to reverse engineer the include as exclude 
+                $include = is_array( $args['include'] ) ? $args['include'] : (array) $args['include'];
+                $exclude = is_array( $args['exclude'] ) ? $args['exclude'] : (array) $args['exclude'];
+                $pages = get_pages(); 
+                foreach( $pages as $page ) {
+                        if( !in_array( $page->ID, $include ) ) 
+                                $exclude[] = $page->ID;
+                }
+                $list_args['exclude'] = implode( ',', $exclude ); 
+                
                 // If the front page is a page, add it to the exclude list
                 if (get_option('show_on_front') == 'page') {
                         if ( !empty( $list_args['exclude'] ) ) {