Ticket #13998: 13998_wp_page_menu_incosistence_2.patch

wp-includes/post-template.php

@@ -840 +840 @@
  * <ul>
  * <li><strong>sort_column</strong> - How to sort the list of pages. Defaults
  * to page title. Use column for posts table.</li>
- * <li><strong>menu_class</strong> - Class to use for the div ID which contains
- * the page list. Defaults to 'menu'.</li>
+ * <li><strong>container_class</strong> - Class that is applied to the container.
+ * <li><strong>menu_class</strong> - Class that is applied to the ul element which
+ * forms the menu. Defaults to 'menu'.</li>
  * <li><strong>echo</strong> - Whether to echo list or return it. Defaults to
  * echo.</li>
  * <li><strong>link_before</strong> - Text before show_home argument text.</li>
@@ -856 +857 @@
  * @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_class' => '', 'menu_class' => 'menu', 'echo' => true, 'link_before' => '', 'link_after' => '');
         $args = wp_parse_args( $args, $defaults );
         $args = apply_filters( 'wp_page_menu_args', $args );
 
@@ -889 +890 @@
         $list_args['title_li'] = '';
         $menu .= str_replace( array( "\r", "\n", "\t" ), '', wp_list_pages($list_args) );
 
-        if ( $menu )
-                $menu = '<ul>' . $menu . '</ul>';
+        $class = $args['menu_class'] ? ' class="'. $args['menu_class'] .'"' : '';
+        $menu = '<ul' . $class . '>' . $menu . '</ul>';
 
-        $menu = '<div class="' . esc_attr($args['menu_class']) . '">' . $menu . "</div>\n";
+        $class = $args['container_class'] ? ' class="' . esc_attr( $args['container_class'] ) . '"' : '';
+        $menu = '<div' . $class . '>' . $menu . "</div>\n";
         $menu = apply_filters( 'wp_page_menu', $menu, $args );
         if ( $args['echo'] )
                 echo $menu;