Ticket #10968: wp_page_menu-container.diff

wp-includes/post-template.php

@@ -879 +879 @@
  * <ul>
  * <li><strong>sort_column</strong> - How to sort the list of pages. Defaults
  * to 'menu_order, post_title'. Use column for posts table.</li>
+ * <li><strong>menu_element</strong> - If you set this argument, it will 
+ * replace the element containing the menu with the specified HTML element.</li>
  * <li><strong>menu_class</strong> - Class to use for the div ID which contains
  * the page list. Defaults to 'menu'.</li>
  * <li><strong>echo</strong> - Whether to echo list or return it. Defaults to
@@ -896 +898 @@
  * @return string html menu
  */
 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_element' => 'div', 
+                'menu_class' => 'menu', 
+                'echo' => true, 
+                'link_before' => '', 
+                'link_after' => ''
+        );
+        
         $args = wp_parse_args( $args, $defaults );
         $args = apply_filters( 'wp_page_menu_args', $args );
 
@@ -932 +942 @@
         if ( $menu )
                 $menu = '<ul>' . $menu . '</ul>';
 
-        $menu = '<div class="' . esc_attr($args['menu_class']) . '">' . $menu . "</div>\n";
+        $menu = '<' . $args['menu_element'] . ' class="' . esc_attr($args['menu_class']) . '">' . $menu . '</' . $args['menu_element'] . ">\n";
         $menu = apply_filters( 'wp_page_menu', $menu, $args );
         if ( $args['echo'] )
                 echo $menu;