Make WordPress Core

Ticket #24101: 24101.patch

File 24101.patch, 1.3 KB (added by Clorith, 12 years ago)
  • nav-menu-template.php

     
    114114         * @param int $depth Depth of page. Not Used.
    115115         */
    116116        function end_el( &$output, $item, $depth = 0, $args = array() ) {
    117                 $output .= "</li>\n";
     117                $output .= $args->separator . "</li>\n";
    118118        }
    119119}
    120120
     
    149149
    150150        $defaults = array( 'menu' => '', 'container' => 'div', 'container_class' => '', 'container_id' => '', 'menu_class' => 'menu', 'menu_id' => '',
    151151        '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>',
    152         'depth' => 0, 'walker' => '', 'theme_location' => '' );
     152        'depth' => 0, 'walker' => '', 'theme_location' => '', 'esparator' => '' );
    153153
    154154        $args = wp_parse_args( $args, $defaults );
    155155        $args = apply_filters( 'wp_nav_menu_args', $args );
     
    247247
    248248        $nav_menu = apply_filters( 'wp_nav_menu', $nav_menu, $args );
    249249
     250    //  Remove last occurrence of the separator
     251    $nav_menu = preg_replace( '/' . preg_quote( $args->separator ) . '(?!.*' . preg_quote( $args->separator ) . ')/', '', $nav_menu, 1 );
     252   
    250253        if ( $args->echo )
    251254                echo $nav_menu;
    252255        else