Ticket #24101: 24101.patch

nav-menu-template.php

@@ -114 +114 @@
          * @param int $depth Depth of page. Not Used.
          */
         function end_el( &$output, $item, $depth = 0, $args = array() ) {
-                $output .= "</li>\n";
+                $output .= $args->separator . "</li>\n";
         }
 }
 
@@ -149 +149 @@
 
         $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' => '' );
+        'depth' => 0, 'walker' => '', 'theme_location' => '', 'esparator' => '' );
 
         $args = wp_parse_args( $args, $defaults );
         $args = apply_filters( 'wp_nav_menu_args', $args );
@@ -247 +247 @@
 
         $nav_menu = apply_filters( 'wp_nav_menu', $nav_menu, $args );
 
+    //  Remove last occurrence of the separator
+    $nav_menu = preg_replace( '/' . preg_quote( $args->separator ) . '(?!.*' . preg_quote( $args->separator ) . ')/', '', $nav_menu, 1 );
+    
         if ( $args->echo )
                 echo $nav_menu;
         else