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

After [34280], rename `menu_tag` arg to `container`, fix docs. 

Props DrewAPicture.
Fixes #10968.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34271 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-09-18 19:05:25 +00:00
parent a87885262f
commit 026bec7990
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1187,15 +1187,15 @@ function wp_list_pages( $args = '' ) {
* arguments.
*
* @since 2.7.0
* @since 4.4.0 Added `$before`, `$after`, and `$walker` arguments.
* @since 4.4.0 Added `container`, `before`, `after`, and `walker` arguments.
*
* @param array|string $args {
* Optional. Arguments to generate a page menu. See wp_list_pages() for additional arguments.
*
* @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_tag Element to use for the element containing the page list. Default 'div'.
* @type string $menu_class Class to use for the element containing the page list. Default 'menu'.
* @type string $container 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).
* Default true.
* @type int|bool|string $show_home Whether to display the link to the home page. Can just enter the text
@ -1212,7 +1212,7 @@ function wp_page_menu( $args = array() ) {
$defaults = array(
'sort_column' => 'menu_order, post_title',
'menu_class' => 'menu',
'menu_tag' => 'div',
'container' => 'div',
'echo' => true,
'show_home' => false,
'link_before' => '',
@ -1266,8 +1266,8 @@ function wp_page_menu( $args = array() ) {
if ( $menu ) {
$menu = $args['before'] . $menu . $args['after'];
}
$tag = sanitize_text_field( $args['menu_tag'] );
$menu = "<{$args['menu_tag']} class=\"" . esc_attr( $args['menu_class'] ) . '">' . $menu . "</{$args['menu_tag']}>\n";
$container = sanitize_text_field( $args['container'] );
$menu = "<{$container} class=\"" . esc_attr( $args['menu_class'] ) . '">' . $menu . "</{$container}>\n";
/**
* Filter the HTML output of a page-based menu.

2
wp-includes/version.php
View File

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