Ticket #39665: 39665.3.diff

src/wp-includes/class-wp-customize-nav-menus.php

@@ -1276 +1276 @@
 
                 $args['customize_preview_nav_menus_args'] = $exported_args;
                 $this->preview_nav_menu_instance_args[ $exported_args['args_hmac'] ] = $exported_args;
+
+                // @todo Refactor for PHP 5.2.
+                if ( $can_partial_refresh && ! empty( $args['fallback_cb'] ) ) {
+                        $original_fallback_cb = $args['fallback_cb'];
+                        $args['fallback_cb'] = function ( $fallback_args ) use ( $original_fallback_cb ) {
+                                ob_start();
+                                $fallback_args['callback_cb'] = $original_fallback_cb;
+                                call_user_func( $original_fallback_cb, $fallback_args );
+                                $output = ob_get_clean();
+                                echo $this->filter_wp_nav_menu( $output, $fallback_args );
+                        };
+                }
+
                 return $args;
         }
 
@@ -1294 +1307 @@
          * @return null
          */
         public function filter_wp_nav_menu( $nav_menu_content, $args ) {
+                $args = (object) $args;
                 if ( isset( $args->customize_preview_nav_menus_args['can_partial_refresh'] ) && $args->customize_preview_nav_menus_args['can_partial_refresh'] ) {
                         $attributes = sprintf( ' data-customize-partial-id="%s"', esc_attr( 'nav_menu_instance[' . $args->customize_preview_nav_menus_args['args_hmac'] . ']' ) );
                         $attributes .= ' data-customize-partial-type="nav_menu_instance"';

src/wp-includes/js/customize-preview-nav-menus.js

@@ -212 +212 @@
                                 } else if ( partial.params.navMenuArgs.theme_location && api.has( 'nav_menu_locations[' + partial.params.navMenuArgs.theme_location + ']' ) ) {
                                         menuId = api( 'nav_menu_locations[' + partial.params.navMenuArgs.theme_location + ']' ).get();
                                 }
-                                if ( ! menuId ) {
+                                if ( ! menuId && ! partial.params.navMenuArgs.fallback_cb ) {
                                         partial.fallback();
                                         deferred.reject();
                                         return deferred.promise();