Ticket #31656: 31656.patch

src/wp-includes/post-template.php

@@ -1143 +1143 @@
  *     @type string          $sort_column How to short the list of pages. Accepts post column names.
  *                                        Default 'menu_order, post_title'.
  *     @type string          $menu_class  Class to use for the div ID containing the page list. Default 'menu'.
+ *     @type string          $menu_id     ID for the div containing the page list. Default is empty string.
  *     @type bool            $echo        Whether to echo the list or return it. Accepts true (echo) or false (return).
  *                                        Default true.
  *     @type string          $link_before The HTML or text to prepend to $show_home text. Default empty.
@@ -1153 +1154 @@
  * @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_class' => 'menu', 'menu_id' => '', 'echo' => true, 'link_before' => '', 'link_after' => '');
         $args = wp_parse_args( $args, $defaults );
 
         /**
@@ -1199 +1200 @@
         if ( $menu )
                 $menu = '<ul>' . $menu . '</ul>';
 
-        $menu = '<div class="' . esc_attr($args['menu_class']) . '">' . $menu . "</div>\n";
+        $menu_class = sanitize_html_class( $args['menu_class'] );
+        $menu_id    = sanitize_html_class( $args['menu_id'] );
 
+        $menu = '<div class="' . esc_attr( $menu_class ) . '" id="' . esc_attr( $menu_id ) . '">' . $menu . "</div>\n";
+
         /**
          * Filter the HTML output of a page-based menu.
          *