Ticket #13333: 13333.2.diff

wp-admin/nav-menus.php

@@ -446 +446 @@
                         <div class="nav-tabs">
                                 <?php
                                 foreach( (array) $nav_menus as $_nav_menu ) :
-                                        if ( $nav_menu_selected_id == $_nav_menu->term_id ) : ?>
-                                                <span class="nav-tab nav-tab-active">
+                                        if ( $nav_menu_selected_id == $_nav_menu->term_id ) : ?><span class="nav-tab nav-tab-active">
                                                         <?php echo esc_html( $_nav_menu->truncated_name ); ?>
-                                                </span>
-                                        <?php else : ?>
-                                                <a href="<?php
+                                                </span><?php else : ?><a href="<?php
                                                         echo esc_url(add_query_arg(
                                                                 array(
                                                                         'action' => 'edit',
@@ -461 +458 @@
                                                         ));
                                                 ?>" class="nav-tab hide-if-no-js">
                                                         <?php echo esc_html( $_nav_menu->truncated_name ); ?>
-                                                </a>
-                                        <?php endif;
+                                                </a><?php endif;
                                 endforeach;
-                                ?><a href="<?php
+                                if ( 0 == $nav_menu_selected_id ) : ?><span class="nav-tab menu-add-new nav-tab-active">
+                                        <?php printf( '<abbr title="%s">+</abbr>', esc_html__( 'Add menu' ) ); ?>
+                                </span><?php else : ?><a href="<?php
                                         echo esc_url(add_query_arg(
                                                 array(
                                                         'action' => 'edit',
@@ -472 +470 @@
                                                 ),
                                                 admin_url( 'nav-menus.php' )
                                         ));
-                                ?>" class="nav-tab menu-add-new<?php
-                                        if ( 0 == $nav_menu_selected_id )
-                                                echo ' nav-tab-active';
-                                ?>"><?php printf( '<abbr title="%s">+</abbr>', esc_html__( 'Add menu' ) ); ?></a>
+                                ?>" class="nav-tab menu-add-new">
+                                        <?php printf( '<abbr title="%s">+</abbr>', esc_html__( 'Add menu' ) ); ?>
+                                </a><?php endif; ?>
                         </div>
                         </div>
                         <div class="menu-edit">