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

Nav menus: Reset the `fallback_cb` default argument in `wp_nav_menu` in case of a Customizer preview. 

props westonruter.
see #32576.
Built from https://develop.svn.wordpress.org/trunk@32763


git-svn-id: http://core.svn.wordpress.org/trunk@32734 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2015-06-14 17:14:24 +00:00
parent 55f3b68c75
commit 8dcd236ba3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/nav-menu-template.php
View File

@ -230,6 +230,11 @@ function wp_nav_menu( $args = array() ) {
'echo' => true, 'fallback_cb' => 'wp_page_menu', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '', 'items_wrap' => '<ul id="%1$s" class="%2$s">%3$s</ul>', 'echo' => true, 'fallback_cb' => 'wp_page_menu', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '', 'items_wrap' => '<ul id="%1$s" class="%2$s">%3$s</ul>',
'depth' => 0, 'walker' => '', 'theme_location' => '' ); 'depth' => 0, 'walker' => '', 'theme_location' => '' );
// Prevent a fallback_cb in Customizer Preview to assist with has_nav_menu() and partial refresh.
if ( is_customize_preview() ) {
$defaults['fallback_cb'] = '';
}
$args = wp_parse_args( $args, $defaults ); $args = wp_parse_args( $args, $defaults );
/** /**
* Filter the arguments used to display a navigation menu. * Filter the arguments used to display a navigation menu.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-alpha-32762'; $wp_version = '4.3-alpha-32763';
/** /**
* 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.