Ticket #32464: 32464.3.patch

src/wp-includes/nav-menu-template.php

@@ -325 +325 @@
 
         $show_container = false;
         if ( $args->container ) {
+
+                if ( ! is_string( $args->container ) ) {
+                        $args->container = 'div';
+                }
+
                 /**
                  * Filter the list of HTML tags that are valid for use as menu containers.
                  *
@@ -334 +339 @@
                  *                    Default is array containing 'div' and 'nav'.
                  */
                 $allowed_tags = apply_filters( 'wp_nav_menu_container_allowedtags', array( 'div', 'nav' ) );
-                if ( is_string( $args->container ) && in_array( $args->container, $allowed_tags ) ) {
+
+                if ( in_array( $args->container, $allowed_tags ) ) {
                         $show_container = true;
                         $class = $args->container_class ? ' class="' . esc_attr( $args->container_class ) . '"' : ' class="menu-'. $menu->slug .'-container"';
                         $id = $args->container_id ? ' id="' . esc_attr( $args->container_id ) . '"' : '';