Changeset 27220

Timestamp:

02/21/2014 06:13:52 PM (11 years ago)

Author:

nacin

Message:

Remove theme support for 'menus' in unregister_nav_menu() when there are no more menus.

props kovshenin.
fixes #26900.

Location:

trunk

Files:

• src/wp-includes/nav-menu.php (modified) (1 diff)
• tests/phpunit/tests/theme/support.php (modified) (1 diff)

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

@@ -91 +91 @@
     if ( is_array( $_wp_registered_nav_menus ) && isset( $_wp_registered_nav_menus[$location] ) ) {
         unset( $_wp_registered_nav_menus[$location] );
+        if ( empty( $_wp_registered_nav_menus ) ) {
+            _remove_theme_support( 'menus' );
+        }
         return true;
     }

trunk/tests/phpunit/tests/theme/support.php

@@ -157 +157 @@
         $this->assertFalse( current_theme_supports( 'foobar', 'bar' ) );
     }
+
+    /**
+     * @ticket 26900
+     */
+    function test_supports_menus() {
+        // Start fresh
+        _remove_theme_support( 'menus' );
+        $this->assertFalse( current_theme_supports( 'menus' ) );
+
+        // Registering a nav menu automatically adds support.
+        register_nav_menu( 'primary', 'Primary Navigation' );
+        register_nav_menu( 'secondary', 'Secondary Navigation' );
+        $this->assertTrue( current_theme_supports( 'menus' ) );
+
+        // Support added internally, can't be removed.
+        remove_theme_support( 'menus' );
+        $this->assertTrue( current_theme_supports( 'menus' ) );
+
+        // Still supports because of secondary.
+        unregister_nav_menu( 'primary' );
+        $this->assertTrue( current_theme_supports( 'menus' ) );
+
+        // No longer support because we have no menus.
+        unregister_nav_menu( 'secondary' );
+        $this->assertEmpty( get_registered_nav_menus() );
+        $this->assertFalse( current_theme_supports( 'menus' ) );
+    }
 }