Ticket #20289: nav-menu-template.diff

diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index eac548b0b0635481eb0803569b2df900b4f7216f..495aa9125e61e06b1bb3620fe0e21ce8b6ac0fb3 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -882,7 +882,7 @@ function wp_list_pages($args = '') {
  * @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', 'container' => 'div', 'menu_class' => 'menu', 'echo' => true, 'link_before' => '', 'link_after' => '');
        $args = wp_parse_args( $args, $defaults );
        $args = apply_filters( 'wp_page_menu_args', $args );
 
@@ -918,7 +918,10 @@ function wp_page_menu( $args = array() ) {
        if ( $menu )
                $menu = '<ul>' . $menu . '</ul>';
 
-       $menu = '<div class="' . esc_attr($args['menu_class']) . '">' . $menu . "</div>\n";
+       $allowed_tags = apply_filters( 'wp_nav_menu_container_allowedtags', array( 'div', 'nav' ) );
+       $container = ( in_array( $args[ 'container' ], $allowed_tags ) ? $args[ 'container' ] : 'div' );
+       
+       $menu = '<'. $container .' class="' . esc_attr($args['menu_class']) . '">' . $menu . "</". $container .">\n";
        $menu = apply_filters( 'wp_page_menu', $menu, $args );
        if ( $args['echo'] )
                echo $menu;