Ticket #24100: 24100.patch

nav-menu-template.php

@@ -246 +246 @@
                 $nav_menu .= '</' . $args->container . '>';
 
         $nav_menu = apply_filters( 'wp_nav_menu', $nav_menu, $args );
+    
+    //  Filter out first/last occurrence of the before or after arguments
+    $nav_menu = preg_replace( '/' . preg_quote( $args->before ) . '/', '', $nav_menu, 1 );
+    $nav_menu = preg_replace( '/' . preg_quote( $args->link_before ) . '/', '', $nav_menu, 1 );
+    $nav_menu = preg_replace( '/' . preg_quote( $args->after ) . '(?!.*' . preg_quote( $args->after ) . ')/', '', $nav_menu, 1 );
+    $nav_menu = preg_replace( '/' . preg_quote( $args->link_after ) . '(?!.*' . preg_quote( $args->link_after ) . ')/', '', $nav_menu, 1 );
 
         if ( $args->echo )
                 echo $nav_menu;