WordPress 4.1.4-scripts

[autoinstalls/wordpress.git] / wp-includes / nav-menu-template.php

diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php
index 4d380a25ee0ccfcdaf6e940af22ab608e05bedae..46cb025c1257c55a42a02bb9c9fb46c2dba1aae6 100644 (file)
--- a/wp-includes/nav-menu-template.php
+++ b/wp-includes/nav-menu-template.php
@@ -85,31 +85,31 @@ class Walker_Nav_Menu extends Walker {
                $classes[] = 'menu-item-' . $item->ID;
 
                /**
-                * Filter the CSS class(es) applied to a menu item's <li>.
+                * Filter the CSS class(es) applied to a menu item's list item element.
                 *
                 * @since 3.0.0
+                * @since 4.1.0 The `$depth` parameter was added.
                 *
-                * @see wp_nav_menu()
-                *
-                * @param array  $classes The CSS classes that are applied to the menu item's <li>.
+                * @param array  $classes The CSS classes that are applied to the menu item's `<li>` element.
                 * @param object $item    The current menu item.
-                * @param array  $args    An array of wp_nav_menu() arguments.
+                * @param array  $args    An array of {@see wp_nav_menu()} arguments.
+                * @param int    $depth   Depth of menu item. Used for padding.
                 */
-               $class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item, $args ) );
+               $class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item, $args, $depth ) );
                $class_names = $class_names ? ' class="' . esc_attr( $class_names ) . '"' : '';
 
                /**
-                * Filter the ID applied to a menu item's <li>.
+                * Filter the ID applied to a menu item's list item element.
                 *
                 * @since 3.0.1
+                * @since 4.1.0 The `$depth` parameter was added.
                 *
-                * @see wp_nav_menu()
-                *
-                * @param string $menu_id The ID that is applied to the menu item's <li>.
+                * @param string $menu_id The ID that is applied to the menu item's `<li>` element.
                 * @param object $item    The current menu item.
-                * @param array  $args    An array of wp_nav_menu() arguments.
+                * @param array  $args    An array of {@see wp_nav_menu()} arguments.
+                * @param int    $depth   Depth of menu item. Used for padding.
                 */
-               $id = apply_filters( 'nav_menu_item_id', 'menu-item-'. $item->ID, $item, $args );
+               $id = apply_filters( 'nav_menu_item_id', 'menu-item-'. $item->ID, $item, $args, $depth );
                $id = $id ? ' id="' . esc_attr( $id ) . '"' : '';
 
                $output .= $indent . '<li' . $id . $class_names .'>';
@@ -121,24 +121,24 @@ class Walker_Nav_Menu extends Walker {
                $atts['href']   = ! empty( $item->url )        ? $item->url        : '';
 
                /**
-                * Filter the HTML attributes applied to a menu item's <a>.
+                * Filter the HTML attributes applied to a menu item's anchor element.
                 *
                 * @since 3.6.0
-                *
-                * @see wp_nav_menu()
+                * @since 4.1.0 The `$depth` parameter was added.
                 *
                 * @param array $atts {
-                *     The HTML attributes applied to the menu item's <a>, empty strings are ignored.
+                *     The HTML attributes applied to the menu item's `<a>` element, empty strings are ignored.
                 *
                 *     @type string $title  Title attribute.
                 *     @type string $target Target attribute.
                 *     @type string $rel    The rel attribute.
                 *     @type string $href   The href attribute.
                 * }
-                * @param object $item The current menu item.
-                * @param array  $args An array of wp_nav_menu() arguments.
+                * @param object $item  The current menu item.
+                * @param array  $args  An array of {@see wp_nav_menu()} arguments.
+                * @param int    $depth Depth of menu item. Used for padding.
                 */
-               $atts = apply_filters( 'nav_menu_link_attributes', $atts, $item, $args );
+               $atts = apply_filters( 'nav_menu_link_attributes', $atts, $item, $args, $depth );
 
                $attributes = '';
                foreach ( $atts as $attr => $value ) {
@@ -158,18 +158,16 @@ class Walker_Nav_Menu extends Walker {
                /**
                 * Filter a menu item's starting output.
                 *
-                * The menu item's starting output only includes $args->before, the opening <a>,
-                * the menu item's title, the closing </a>, and $args->after. Currently, there is
-                * no filter for modifying the opening and closing <li> for a menu item.
+                * The menu item's starting output only includes `$args->before`, the opening `<a>`,
+                * the menu item's title, the closing `</a>`, and `$args->after`. Currently, there is
+                * no filter for modifying the opening and closing `<li>` for a menu item.
                 *
                 * @since 3.0.0
                 *
-                * @see wp_nav_menu()
-                *
                 * @param string $item_output The menu item's starting HTML output.
                 * @param object $item        Menu item data object.
                 * @param int    $depth       Depth of menu item. Used for padding.
-                * @param array  $args        An array of wp_nav_menu() arguments.
+                * @param array  $args        An array of {@see wp_nav_menu()} arguments.
                 */
                $output .= apply_filters( 'walker_nav_menu_start_el', $item_output, $item, $depth, $args );
        }
@@ -277,7 +275,7 @@ function wp_nav_menu( $args = array() ) {
 
        // get the first menu that has items if we still can't find a menu
        if ( ! $menu && !$args->theme_location ) {
-               $menus = wp_get_nav_menus( array( 'orderby' => 'name' ) );
+               $menus = wp_get_nav_menus();
                foreach ( $menus as $menu_maybe ) {
                        if ( $menu_items = wp_get_nav_menu_items( $menu_maybe->term_id, array( 'update_post_term_cache' => false ) ) ) {
                                $menu = $menu_maybe;