Changeset 34950

Timestamp:

10/08/2015 06:26:13 PM (9 years ago)

Author:

obenland

Message:

Template: Add fallback for empty containers.

Since [14031] the container can be omitted in wp_nav_menu(). It can not
however in wp_page_menu(), which creates a conflict if it is set as
the fallback, Let's make sure there is always a valid container tag.

Fixes #33974.

Location:

trunk

Files:

• src/wp-includes/post-template.php (modified) (1 diff)
• tests/phpunit/tests/post/template.php (modified) (2 diffs)

trunk/src/wp-includes/post-template.php

@@ -1276 +1276 @@
     $container = sanitize_text_field( $args['container'] );
 
+    // Fallback in case `wp_nav_menu()` was called without a container.
+    if ( empty( $container ) ) {
+        $container = 'div';
+    }
+
     if ( $menu ) {
 

trunk/tests/phpunit/tests/post/template.php

@@ -282 +282 @@
     /**
      * @ticket 11095
+     * @ticket 33974
      */
     public function test_wp_page_menu_wp_nav_menu_fallback() {
@@ -294 +295 @@
         // After falling back, the 'after' argument should be set and output as '</ul>'.
         $this->assertRegExp( '/<\/ul><\/div>/', $menu );
+
+        // No menus + wp_nav_menu() falls back to wp_page_menu(), this time without a container.
+        $menu = wp_nav_menu( array(
+            'echo'      => false,
+            'container' => false,
+        ) );
+
+        // After falling back, the empty 'container' argument should still return a container element.
+        $this->assertRegExp( '/<div class="menu">/', $menu );
     }
 }