Ticket #23832: 23832.patch

wp-admin/nav-menus.php

@@ -474 +474 @@
 ?>
 <div class="wrap">
         <?php screen_icon(); ?>
-        <h2><?php _e( 'Menus' ); ?> <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0, ), admin_url( 'nav-menus.php' ) ) ); ?>" class="add-new-h2"><?php _ex( 'Add New', 'menu' ); ?></a></h2>
+        <h2><?php _e( 'Menus' ); ?> <?php if ( !$add_new_screen ) : ?><a href="<?php echo esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0, ), admin_url( 'nav-menus.php' ) ) ); ?>" class="add-new-h2"><?php _ex( 'Add New', 'menu' ); ?></a><?php endif; ?></h2>
         <?php
         foreach( $messages as $message ) :
                 echo $message . "\n";
@@ -483 +483 @@
         <div class="manage-menus">
         <?php if ( $menu_count < 2 ) : ?>
                 <span class="add-edit-menu-action">
-                        <?php printf( __( 'Edit your menu below, or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
+                        <?php printf( __( 'Edit your menu below, or <a href="%s">add a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
                 </span><!-- /add-edit-menu-action -->
         <?php else : ?>
                 <form method="post" action="<?php echo admin_url( 'nav-menus.php' ); ?>">
@@ -516 +516 @@
                                 <?php endforeach; ?>
                         </select>
                         <span class="submit-btn"><input type="submit" class="button-secondary" value="<?php _e( 'Select' ); ?>"></span>
+                        <?php if ( !$add_new_screen ) : ?>
                         <span class="add-new-menu-action">
-                                <?php printf( __( 'or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
+                                <?php printf( __( 'or <a href="%s">add a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
                         </span><!-- /add-new-menu-action -->
+                        <?php endif; ?>
                 </form>
         <?php endif; ?>
         </div><!-- /manage-menus -->