Changeset 14482 for trunk/wp-admin/nav-menus.php

Timestamp:

05/06/2010 07:19:53 PM (16 years ago)

Author:

nacin

Message:

Ensure valid HTML in the nav menu UI. props ocean90, see #13220.

File:

• trunk/wp-admin/nav-menus.php (modified) (7 diffs)

trunk/wp-admin/nav-menus.php

@@ -422 +422 @@
         <div id="menu-management">
             <div id="select-nav-menu-container" class="hide-if-js">
-                <form id="select-nav-menu">
+                <form id="select-nav-menu" action="">
                     <strong><label for="select-nav-menu"><?php esc_html_e( 'Select Menu: ' ); ?></label></strong>
-                    <select id="select-nav-menu" name="menu">
+                    <select class="select-nav-menu" name="menu">
                         <?php foreach( (array) $nav_menus as $_nav_menu ) : ?>
                             <option value="<?php echo esc_attr($_nav_menu->term_id) ?>" <?php selected($nav_menu_selected_id, $_nav_menu->term_id); ?>>
@@ -442 +442 @@
 
                     ?><a href="<?php
-                        echo add_query_arg(
+                        echo esc_url(add_query_arg(
                             array(
                                 'action' => 'edit',
@@ -448 +448 @@
                             ),
                             admin_url( 'nav-menus.php' )
-                        );
+                        ));
                     ?>" class="nav-tab<?php
                         if ( $nav_menu_selected_id == $_nav_menu->term_id )
@@ -457 +457 @@
                 endforeach;
                 ?><a href="<?php
-                    echo add_query_arg(
+                    echo esc_url(add_query_arg(
                         array(
                             'action' => 'edit',
@@ -463 +463 @@
                         ),
                         admin_url( 'nav-menus.php' )
-                    );
+                    ));
                 ?>" class="nav-tab menu-add-new<?php
                     if ( 0 == $nav_menu_selected_id )
@@ -477 +477 @@
                                 <label class="menu-name-label howto open-label" for="menu-name">
                                     <span><?php _e('Menu Name'); ?></span>
-                                    <input name="menu-name" type="text" class="menu-name regular-text menu-item-textbox input-with-default-title" title="Enter menu name here." value="<?php echo esc_attr( $nav_menu_selected_title  ); ?>" />
+                                    <input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox input-with-default-title" title="Enter menu name here." value="<?php echo esc_attr( $nav_menu_selected_title  ); ?>" />
                                     <br class="clear" />
                                 </label>
@@ -487 +487 @@
                                 <?php if ( ! empty( $nav_menu_selected_id ) ) : ?>
                                 <div class="delete-action">
-                                    <a class="submitdelete deletion menu-delete" href="<?php echo wp_nonce_url( admin_url('nav-menus.php?action=delete&amp;menu=' . $nav_menu_selected_id), 'delete-nav_menu-' . $nav_menu_selected_id ); ?>"><?php _e('Delete Menu'); ?></a>
+                                    <a class="submitdelete deletion menu-delete" href="<?php echo esc_url( wp_nonce_url( admin_url('nav-menus.php?action=delete&amp;menu=' . $nav_menu_selected_id), 'delete-nav_menu-' . $nav_menu_selected_id ) ); ?>"><?php _e('Delete Menu'); ?></a>
                                 </div><!--END .delete-action-->
                                 <?php endif; ?>