Changeset 40665

Timestamp:

05/14/2017 03:37:45 AM (7 years ago)

Author:

peterwilsoncc

Message:

Menus: Prevent empty class attribute following [40537].

Prevents an empty class attribute, class="", from appearing in the HTML if a developer removes all classes using the nav_menu_submenu_css_class filter.

Props Kopepasah.
Fixes #36163.

File:

• trunk/src/wp-includes/class-walker-nav-menu.php (modified) (2 diffs)

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

@@ -60 +60 @@
         $indent = str_repeat( $t, $depth );
 
+        // Default class.
+        $classes = array( 'sub-menu' );
+
         /**
          * Filters the CSS class(es) applied to a menu list element.
@@ -69 +72 @@
          * @param int      $depth   Depth of menu item. Used for padding.
          */
-
-        $classes = array( 'sub-menu' );
-        $classes = apply_filters( 'nav_menu_submenu_css_class', $classes, $args, $depth );
-        $class_names = join( ' ', $classes );
-
-        $output .= "{$n}{$indent}<ul class='" . esc_attr( $class_names ) . "'>{$n}";
+        $class_names = join( ' ', apply_filters( 'nav_menu_submenu_css_class', $classes, $args, $depth ) );
+        $class_names = $class_names ? ' class="' . esc_attr( $class_names ) . '"' : '';
+
+        $output .= "{$n}{$indent}<ul $class_names>{$n}";
     }