Ticket #18232: 18232_v2.patch

nav-menu-template.php

@@ -138 +138 @@
         static $menu_id_slugs = array();
 
         $defaults = array( 'menu' => '', 'container' => 'div', 'container_class' => '', 'container_id' => '', 'menu_class' => 'menu', 'menu_id' => '',
-        'echo' => true, 'fallback_cb' => 'wp_page_menu', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '', 'items_wrap' => '<ul id="%1$s" class="%2$s">%3$s</ul>',
-        'depth' => 0, 'walker' => '', 'theme_location' => '' );
+        'echo' => true, 'fallback_cb' => 'wp_page_menu', 'fallback_args' => '', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '',
+        'items_wrap' => '<ul id="%1$s" class="%2$s">%3$s</ul>', 'depth' => 0, 'walker' => '', 'theme_location' => '' );
 
         $args = wp_parse_args( $args, $defaults );
         $args = apply_filters( 'wp_nav_menu_args', $args );
@@ -170 +170 @@
         // If no menu was found or if the menu has no items and no location was requested, call the fallback_cb if it exists
         if ( ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) && !$args->theme_location ) )
                 && $args->fallback_cb && is_callable( $args->fallback_cb ) )
-                        return call_user_func( $args->fallback_cb, (array) $args );
+                        return call_user_func( $args->fallback_cb, (array) $args->fallback_args );
 
         // If no fallback function was specified and the menu doesn't exists, bail.
         if ( !$menu || is_wp_error($menu) )