From 2678bd9225fff718d03b36b6f6bd1837e349de5a Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Tue, 4 Aug 2015 21:57:25 +0000 Subject: [PATCH] Customizer: Restore default `fallback_cb` arg for `wp_nav_menu()` calls in customizer preview. Props ocean90, westonruter. Fixes #33218. Built from https://develop.svn.wordpress.org/trunk@33585 git-svn-id: http://core.svn.wordpress.org/trunk@33552 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/nav-menu-template.php | 5 ----- wp-includes/version.php | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php index 80c0454e2a..bcc9b6325c 100644 --- a/wp-includes/nav-menu-template.php +++ b/wp-includes/nav-menu-template.php @@ -230,11 +230,6 @@ function wp_nav_menu( $args = array() ) { 'echo' => true, 'fallback_cb' => 'wp_page_menu', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '', 'items_wrap' => '', '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 ); /** * Filter the arguments used to display a navigation menu. diff --git a/wp-includes/version.php b/wp-includes/version.php index 6c8aa3331d..4e2e30cb08 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-RC2-33584'; +$wp_version = '4.3-RC2-33585'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.