Changeset 54809

Timestamp:

11/11/2022 02:40:54 AM (4 years ago)

Author:

desrosj

Message:

Menus: Apply menu-item-has-children class in sub-menus.

Ensure the menu-item-has-children class is added to sub-menu items when wp_nav_menu() is called with the depth parameter specified to a non-zero value.

Follow up to [54478].

Props davidvongries, fpodhorsky, hellofromTonya, innovext, larsmqller, LeonidasMilossis, mattkeys, mukesh27, nuvoPoint, ocean90, outrankjames, petitphp, SergeyBiryukov, sippis, webmandesign, peterwilsoncc.
Merges [54801] to the 6.1 branch.
Fixes #56946.
See #28620.

Location:

branches/6.1

Files:

• . (modified) (1 prop)
• src/wp-includes/nav-menu-template.php (modified) (1 diff)
• tests/phpunit/tests/menu/wp-nav-menu.php (modified) (8 diffs)

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

@@ -205 +205 @@
                         $menu_items_with_children[ $menu_item->menu_item_parent ] = 1;
                 }
-
-                // Calculate the depth of each menu item with children
-                foreach ( $menu_items_with_children as $menu_item_key => &$menu_item_depth ) {
-                        $menu_item_parent = $menu_items_tree[ $menu_item_key ];
-                        while ( $menu_item_parent ) {
-                                $menu_item_depth  = $menu_item_depth + 1;
-                                $menu_item_parent = $menu_items_tree[ $menu_item_parent ];
-                        }
+        }
+
+        // Calculate the depth of each menu item with children.
+        foreach ( $menu_items_with_children as $menu_item_key => &$menu_item_depth ) {
+                $menu_item_parent = $menu_items_tree[ $menu_item_key ];
+                while ( $menu_item_parent ) {
+                        $menu_item_depth  = $menu_item_depth + 1;
+                        $menu_item_parent = $menu_items_tree[ $menu_item_parent ];
                 }
         }

branches/6.1/tests/phpunit/tests/menu/wp-nav-menu.php

@@ -12 +12 @@
         static $lvl1_menu_item = 0;
         static $lvl2_menu_item = 0;
+        static $lvl3_menu_item = 0;
 
         public static function set_up_before_class() {
@@ -50 +51 @@
                                 'menu-item-url'       => '#',
                                 'menu-item-parent-id' => self::$lvl1_menu_item,
+                                'menu-item-status'    => 'publish',
+                        )
+                );
+
+                // Create lvl3 menu item.
+                self::$lvl3_menu_item = wp_update_nav_menu_item(
+                        self::$menu_id,
+                        0,
+                        array(
+                                'menu-item-title'     => 'Lvl3 menu item',
+                                'menu-item-url'       => '#',
+                                'menu-item-parent-id' => self::$lvl2_menu_item,
                                 'menu-item-status'    => 'publish',
                         )
@@ -82 +95 @@
          *
          * @ticket 28620
+         * @ticket 56946
          */
         public function test_wp_nav_menu_should_have_has_children_class_without_custom_depth() {
@@ -113 +127 @@
                 $this->assertStringContainsString(
                         sprintf(
+                                '<li id="menu-item-%1$d" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-has-children menu-item-%1$d">',
+                                self::$lvl2_menu_item
+                        ),
+                        $menu_html,
+                        'Level 2 should be present in the HTML output and have the `menu-item-has-children` class.'
+                );
+
+                $this->assertStringContainsString(
+                        sprintf(
                                 '<li id="menu-item-%1$d" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-%1$d">',
-                                self::$lvl2_menu_item
-                        ),
-                        $menu_html,
-                        'Level 2 should be present in the HTML output and not have the `menu-item-has-children` class since it has no children.'
+                                self::$lvl3_menu_item
+                        ),
+                        $menu_html,
+                        'Level 3 should be present in the HTML output and not have the `menu-item-has-children` class since it has no children.'
                 );
         }
@@ -126 +149 @@
          *
          * @ticket 28620
+         * @ticket 56946
          */
         public function test_wp_nav_menu_should_not_have_has_children_class_with_custom_depth() {
@@ -133 +157 @@
                         array(
                                 'menu'  => self::$menu_id,
-                                'depth' => 2,
+                                'depth' => 3,
                                 'echo'  => false,
                         )
@@ -149 +173 @@
                 $this->assertStringContainsString(
                         sprintf(
+                                '<li id="menu-item-%1$d" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-has-children menu-item-%1$d">',
+                                self::$lvl1_menu_item
+                        ),
+                        $menu_html,
+                        'Level 1 should be present in the HTML output and have the `menu-item-has-children` class.'
+                );
+
+                $this->assertStringContainsString(
+                        sprintf(
                                 '<li id="menu-item-%1$d" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-%1$d">',
-                                self::$lvl1_menu_item
-                        ),
-                        $menu_html,
-                        'Level 1 should be present in the HTML output and not have the `menu-item-has-children` class since it is the last item to be rendered.'
+                                self::$lvl2_menu_item
+                        ),
+                        $menu_html,
+                        'Level 2 should be present in the HTML output and not have the `menu-item-has-children` class since it is the last item to be rendered.'
                 );
 
@@ -159 +192 @@
                         sprintf(
                                 '<li id="menu-item-%d"',
-                                self::$lvl2_menu_item
-                        ),
-                        $menu_html,
-                        'Level 2 should not be present in the HTML output.'
+                                self::$lvl3_menu_item
+                        ),
+                        $menu_html,
+                        'Level 3 should not be present in the HTML output.'
                 );
         }