WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add an argument to `wp_page_menu()`, `'menu_tag'`, which defaults to `div` but can be overridden to allow HTML5 tags like `nav`. 

Props paulwilde, stebbiv, wonderboymusic.
Fixes #10968.

Built from https://develop.svn.wordpress.org/trunk@34280


git-svn-id: http://core.svn.wordpress.org/trunk@34244 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-09-18 06:07:24 +00:00
parent 88c1ab7c74
commit 3ed914175a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/post-template.php
View File

@ -1195,6 +1195,7 @@ function wp_list_pages( $args = '' ) {
* @type string $sort_column How to short the list of pages. Accepts post column names. * @type string $sort_column How to short the list of pages. Accepts post column names.
* Default 'menu_order, post_title'. * 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_class Class to use for the div ID containing the page list. Default 'menu'.
* @type string $menu_tag Element to use for the element containing the page list. Default 'div'.
* @type bool $echo Whether to echo the list or return it. Accepts true (echo) or false (return). * @type bool $echo Whether to echo the list or return it. Accepts true (echo) or false (return).
* Default true. * Default true.
* @type int|bool|string $show_home Whether to display the link to the home page. Can just enter the text * @type int|bool|string $show_home Whether to display the link to the home page. Can just enter the text
@ -1211,6 +1212,7 @@ function wp_page_menu( $args = array() ) {
$defaults = array( $defaults = array(
'sort_column' => 'menu_order, post_title', 'sort_column' => 'menu_order, post_title',
'menu_class' => 'menu', 'menu_class' => 'menu',
'menu_tag' => 'div',
'echo' => true, 'echo' => true,
'show_home' => false, 'show_home' => false,
'link_before' => '', 'link_before' => '',
@ -1264,7 +1266,8 @@ function wp_page_menu( $args = array() ) {
if ( $menu ) { if ( $menu ) {
$menu = $args['before'] . $menu . $args['after']; $menu = $args['before'] . $menu . $args['after'];
} }
$menu = '<div class="' . esc_attr($args['menu_class']) . '">' . $menu . "</div>\n"; $tag = sanitize_text_field( $args['menu_tag'] );
$menu = "<{$args['menu_tag']} class=\"" . esc_attr( $args['menu_class'] ) . '">' . $menu . "</{$args['menu_tag']}>\n";
/** /**
* Filter the HTML output of a page-based menu. * Filter the HTML output of a page-based menu.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34278'; $wp_version = '4.4-alpha-34280';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.