]> scripts.mit.edu Git - autoinstalls/wordpress.git/blobdiff - wp-admin/includes/nav-menu.php
WordPress 4.5
[autoinstalls/wordpress.git] / wp-admin / includes / nav-menu.php
index 7c3380275fcadec882aaf407cc758d49ad8e984c..18dcc97f6c4574b0da29dadc03c00863fded007a 100644 (file)
 <?php
-
 /**
- * Create HTML list of nav menu input items.
+ * Core Navigation Menu API
  *
  * @package WordPress
+ * @subpackage Nav_Menus
  * @since 3.0.0
- * @uses Walker_Nav_Menu
  */
-class Walker_Nav_Menu_Edit extends Walker_Nav_Menu  {
-       /**
-        * @see Walker_Nav_Menu::start_lvl()
-        * @since 3.0.0
-        *
-        * @param string $output Passed by reference.
-        */
-       function start_lvl(&$output) {}
-
-       /**
-        * @see Walker_Nav_Menu::end_lvl()
-        * @since 3.0.0
-        *
-        * @param string $output Passed by reference.
-        */
-       function end_lvl(&$output) {
-       }
 
-       /**
-        * @see Walker::start_el()
-        * @since 3.0.0
-        *
-        * @param string $output Passed by reference. Used to append additional content.
-        * @param object $item Menu item data object.
-        * @param int $depth Depth of menu item. Used for padding.
-        * @param object $args
-        */
-       function start_el(&$output, $item, $depth, $args) {
-               global $_wp_nav_menu_max_depth;
-               $_wp_nav_menu_max_depth = $depth > $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth;
-
-               $indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
-
-               ob_start();
-               $item_id = esc_attr( $item->ID );
-               $removed_args = array(
-                       'action',
-                       'customlink-tab',
-                       'edit-menu-item',
-                       'menu-item',
-                       'page-tab',
-                       '_wpnonce',
-               );
-
-               $original_title = '';
-               if ( 'taxonomy' == $item->type ) {
-                       $original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' );
-                       if ( is_wp_error( $original_title ) )
-                               $original_title = false;
-               } elseif ( 'post_type' == $item->type ) {
-                       $original_object = get_post( $item->object_id );
-                       $original_title = $original_object->post_title;
-               }
+/** Walker_Nav_Menu_Edit class */
+require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-edit.php' );
 
-               $classes = array(
-                       'menu-item menu-item-depth-' . $depth,
-                       'menu-item-' . esc_attr( $item->object ),
-                       'menu-item-edit-' . ( ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? 'active' : 'inactive'),
-               );
-
-               $title = $item->title;
-
-               if ( ! empty( $item->_invalid ) ) {
-                       $classes[] = 'menu-item-invalid';
-                       /* translators: %s: title of menu item which is invalid */
-                       $title = sprintf( __( '%s (Invalid)' ), $item->title );
-               } elseif ( isset( $item->post_status ) && 'draft' == $item->post_status ) {
-                       $classes[] = 'pending';
-                       /* translators: %s: title of menu item in draft status */
-                       $title = sprintf( __('%s (Pending)'), $item->title );
-               }
-
-               $title = empty( $item->label ) ? $title : $item->label;
-
-               ?>
-               <li id="menu-item-<?php echo $item_id; ?>" class="<?php echo implode(' ', $classes ); ?>">
-                       <dl class="menu-item-bar">
-                               <dt class="menu-item-handle">
-                                       <span class="item-title"><?php echo esc_html( $title ); ?></span>
-                                       <span class="item-controls">
-                                               <span class="item-type"><?php echo esc_html( $item->type_label ); ?></span>
-                                               <span class="item-order hide-if-js">
-                                                       <a href="<?php
-                                                               echo wp_nonce_url(
-                                                                       add_query_arg(
-                                                                               array(
-                                                                                       'action' => 'move-up-menu-item',
-                                                                                       'menu-item' => $item_id,
-                                                                               ),
-                                                                               remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
-                                                                       ),
-                                                                       'move-menu_item'
-                                                               );
-                                                       ?>" class="item-move-up"><abbr title="<?php esc_attr_e('Move up'); ?>">&#8593;</abbr></a>
-                                                       |
-                                                       <a href="<?php
-                                                               echo wp_nonce_url(
-                                                                       add_query_arg(
-                                                                               array(
-                                                                                       'action' => 'move-down-menu-item',
-                                                                                       'menu-item' => $item_id,
-                                                                               ),
-                                                                               remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
-                                                                       ),
-                                                                       'move-menu_item'
-                                                               );
-                                                       ?>" class="item-move-down"><abbr title="<?php esc_attr_e('Move down'); ?>">&#8595;</abbr></a>
-                                               </span>
-                                               <a class="item-edit" id="edit-<?php echo $item_id; ?>" title="<?php esc_attr_e('Edit Menu Item'); ?>" href="<?php
-                                                       echo ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? admin_url( 'nav-menus.php' ) : add_query_arg( 'edit-menu-item', $item_id, remove_query_arg( $removed_args, admin_url( 'nav-menus.php#menu-item-settings-' . $item_id ) ) );
-                                               ?>"><?php _e( 'Edit Menu Item' ); ?></a>
-                                       </span>
-                               </dt>
-                       </dl>
-
-                       <div class="menu-item-settings" id="menu-item-settings-<?php echo $item_id; ?>">
-                               <?php if( 'custom' == $item->type ) : ?>
-                                       <p class="field-url description description-wide">
-                                               <label for="edit-menu-item-url-<?php echo $item_id; ?>">
-                                                       <?php _e( 'URL' ); ?><br />
-                                                       <input type="text" id="edit-menu-item-url-<?php echo $item_id; ?>" class="widefat code edit-menu-item-url" name="menu-item-url[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->url ); ?>" />
-                                               </label>
-                                       </p>
-                               <?php endif; ?>
-                               <p class="description description-thin">
-                                       <label for="edit-menu-item-title-<?php echo $item_id; ?>">
-                                               <?php _e( 'Navigation Label' ); ?><br />
-                                               <input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->title ); ?>" />
-                                       </label>
-                               </p>
-                               <p class="description description-thin">
-                                       <label for="edit-menu-item-attr-title-<?php echo $item_id; ?>">
-                                               <?php _e( 'Title Attribute' ); ?><br />
-                                               <input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->post_excerpt ); ?>" />
-                                       </label>
-                               </p>
-                               <p class="field-link-target description">
-                                       <label for="edit-menu-item-target-<?php echo $item_id; ?>">
-                                               <input type="checkbox" id="edit-menu-item-target-<?php echo $item_id; ?>" value="_blank" name="menu-item-target[<?php echo $item_id; ?>]"<?php checked( $item->target, '_blank' ); ?> />
-                                               <?php _e( 'Open link in a new window/tab' ); ?>
-                                       </label>
-                               </p>
-                               <p class="field-css-classes description description-thin">
-                                       <label for="edit-menu-item-classes-<?php echo $item_id; ?>">
-                                               <?php _e( 'CSS Classes (optional)' ); ?><br />
-                                               <input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr( implode(' ', $item->classes ) ); ?>" />
-                                       </label>
-                               </p>
-                               <p class="field-xfn description description-thin">
-                                       <label for="edit-menu-item-xfn-<?php echo $item_id; ?>">
-                                               <?php _e( 'Link Relationship (XFN)' ); ?><br />
-                                               <input type="text" id="edit-menu-item-xfn-<?php echo $item_id; ?>" class="widefat code edit-menu-item-xfn" name="menu-item-xfn[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->xfn ); ?>" />
-                                       </label>
-                               </p>
-                               <p class="field-description description description-wide">
-                                       <label for="edit-menu-item-description-<?php echo $item_id; ?>">
-                                               <?php _e( 'Description' ); ?><br />
-                                               <textarea id="edit-menu-item-description-<?php echo $item_id; ?>" class="widefat edit-menu-item-description" rows="3" cols="20" name="menu-item-description[<?php echo $item_id; ?>]"><?php echo esc_html( $item->description ); // textarea_escaped ?></textarea>
-                                               <span class="description"><?php _e('The description will be displayed in the menu if the current theme supports it.'); ?></span>
-                                       </label>
-                               </p>
-
-                               <div class="menu-item-actions description-wide submitbox">
-                                       <?php if( 'custom' != $item->type && $original_title !== false ) : ?>
-                                               <p class="link-to-original">
-                                                       <?php printf( __('Original: %s'), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' ); ?>
-                                               </p>
-                                       <?php endif; ?>
-                                       <a class="item-delete submitdelete deletion" id="delete-<?php echo $item_id; ?>" href="<?php
-                                       echo wp_nonce_url(
-                                               add_query_arg(
-                                                       array(
-                                                               'action' => 'delete-menu-item',
-                                                               'menu-item' => $item_id,
-                                                       ),
-                                                       remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
-                                               ),
-                                               'delete-menu_item_' . $item_id
-                                       ); ?>"><?php _e('Remove'); ?></a> <span class="meta-sep"> | </span> <a class="item-cancel submitcancel" id="cancel-<?php echo $item_id; ?>" href="<?php echo esc_url( add_query_arg( array('edit-menu-item' => $item_id, 'cancel' => time()), remove_query_arg( $removed_args, admin_url( 'nav-menus.php' ) ) ) );
-                                               ?>#menu-item-settings-<?php echo $item_id; ?>"><?php _e('Cancel'); ?></a>
-                               </div>
-
-                               <input class="menu-item-data-db-id" type="hidden" name="menu-item-db-id[<?php echo $item_id; ?>]" value="<?php echo $item_id; ?>" />
-                               <input class="menu-item-data-object-id" type="hidden" name="menu-item-object-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object_id ); ?>" />
-                               <input class="menu-item-data-object" type="hidden" name="menu-item-object[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object ); ?>" />
-                               <input class="menu-item-data-parent-id" type="hidden" name="menu-item-parent-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_item_parent ); ?>" />
-                               <input class="menu-item-data-position" type="hidden" name="menu-item-position[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_order ); ?>" />
-                               <input class="menu-item-data-type" type="hidden" name="menu-item-type[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->type ); ?>" />
-                       </div><!-- .menu-item-settings-->
-                       <ul class="menu-item-transport"></ul>
-               <?php
-               $output .= ob_get_clean();
-       }
-}
-
-/**
- * Create HTML list of nav menu input items.
- *
- * @package WordPress
- * @since 3.0.0
- * @uses Walker_Nav_Menu
- */
-class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu  {
-       function __construct( $fields = false ) {
-               if ( $fields ) {
-                       $this->db_fields = $fields;
-               }
-       }
-
-       function start_lvl( &$output, $depth ) {
-               $indent = str_repeat( "\t", $depth );
-               $output .= "\n$indent<ul class='children'>\n";
-       }
-
-       function end_lvl( &$output, $depth ) {
-               $indent = str_repeat( "\t", $depth );
-               $output .= "\n$indent</ul>";
-       }
-
-       /**
-        * @see Walker::start_el()
-        * @since 3.0.0
-        *
-        * @param string $output Passed by reference. Used to append additional content.
-        * @param object $item Menu item data object.
-        * @param int $depth Depth of menu item. Used for padding.
-        * @param object $args
-        */
-       function start_el(&$output, $item, $depth, $args) {
-               global $_nav_menu_placeholder;
-
-               $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
-               $possible_object_id = isset( $item->post_type ) && 'nav_menu_item' == $item->post_type ? $item->object_id : $_nav_menu_placeholder;
-               $possible_db_id = ( ! empty( $item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $item->ID : 0;
-
-               $indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
-
-               $output .= $indent . '<li>';
-               $output .= '<label class="menu-item-title">';
-               $output .= '<input type="checkbox" class="menu-item-checkbox';
-               if ( ! empty( $item->_add_to_top ) ) {
-                       $output .= ' add-to-top';
-               }
-               $output .= '" name="menu-item[' . $possible_object_id . '][menu-item-object-id]" value="'. esc_attr( $item->object_id ) .'" /> ';
-               $output .= empty( $item->label ) ? esc_html( $item->title ) : esc_html( $item->label );
-               $output .= '</label>';
-
-               // Menu item hidden fields
-               $output .= '<input type="hidden" class="menu-item-db-id" name="menu-item[' . $possible_object_id . '][menu-item-db-id]" value="' . $possible_db_id . '" />';
-               $output .= '<input type="hidden" class="menu-item-object" name="menu-item[' . $possible_object_id . '][menu-item-object]" value="'. esc_attr( $item->object ) .'" />';
-               $output .= '<input type="hidden" class="menu-item-parent-id" name="menu-item[' . $possible_object_id . '][menu-item-parent-id]" value="'. esc_attr( $item->menu_item_parent ) .'" />';
-               $output .= '<input type="hidden" class="menu-item-type" name="menu-item[' . $possible_object_id . '][menu-item-type]" value="'. esc_attr( $item->type ) .'" />';
-               $output .= '<input type="hidden" class="menu-item-title" name="menu-item[' . $possible_object_id . '][menu-item-title]" value="'. esc_attr( $item->title ) .'" />';
-               $output .= '<input type="hidden" class="menu-item-url" name="menu-item[' . $possible_object_id . '][menu-item-url]" value="'. esc_attr( $item->url ) .'" />';
-               $output .= '<input type="hidden" class="menu-item-target" name="menu-item[' . $possible_object_id . '][menu-item-target]" value="'. esc_attr( $item->target ) .'" />';
-               $output .= '<input type="hidden" class="menu-item-attr_title" name="menu-item[' . $possible_object_id . '][menu-item-attr_title]" value="'. esc_attr( $item->attr_title ) .'" />';
-               $output .= '<input type="hidden" class="menu-item-classes" name="menu-item[' . $possible_object_id . '][menu-item-classes]" value="'. esc_attr( implode( ' ', $item->classes ) ) .'" />';
-               $output .= '<input type="hidden" class="menu-item-xfn" name="menu-item[' . $possible_object_id . '][menu-item-xfn]" value="'. esc_attr( $item->xfn ) .'" />';
-       }
-}
+/** Walker_Nav_Menu_Checklist class */
+require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-checklist.php' );
 
 /**
  * Prints the appropriate response to a menu quick search.
@@ -293,8 +38,7 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
                                if ( 'markup' == $response_format ) {
                                        echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $object_id ) ) ), 0, (object) $args );
                                } elseif ( 'json' == $response_format ) {
-                                       $post_obj = get_post( $object_id );
-                                       echo json_encode(
+                                       echo wp_json_encode(
                                                array(
                                                        'ID' => $object_id,
                                                        'post_title' => get_the_title( $object_id ),
@@ -311,7 +55,7 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
                                        echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_term( $object_id, $object_type ) ) ), 0, (object) $args );
                                } elseif ( 'json' == $response_format ) {
                                        $post_obj = get_term( $object_id, $object_type );
-                                       echo json_encode(
+                                       echo wp_json_encode(
                                                array(
                                                        'ID' => $object_id,
                                                        'post_title' => $post_obj->name,
@@ -324,7 +68,6 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
 
                }
 
-
        } elseif ( preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches) ) {
                if ( 'posttype' == $matches[1] && get_post_type_object( $matches[2] ) ) {
                        query_posts(array(
@@ -340,7 +83,7 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
                                        $var_by_ref = get_the_ID();
                                        echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $var_by_ref ) ) ), 0, (object) $args );
                                } elseif ( 'json' == $response_format ) {
-                                       echo json_encode(
+                                       echo wp_json_encode(
                                                array(
                                                        'ID' => get_the_ID(),
                                                        'post_title' => get_the_title(),
@@ -357,11 +100,11 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
                        ));
                        if ( empty( $terms ) || is_wp_error( $terms ) )
                                return;
-                       foreach( (array) $terms as $term ) {
+                       foreach ( (array) $terms as $term ) {
                                if ( 'markup' == $response_format ) {
                                        echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
                                } elseif ( 'json' == $response_format ) {
-                                       echo json_encode(
+                                       echo wp_json_encode(
                                                array(
                                                        'ID' => $term->term_id,
                                                        'post_title' => $term->name,
@@ -382,28 +125,28 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
  **/
 function wp_nav_menu_setup() {
        // Register meta boxes
-       if ( wp_get_nav_menus() )
-               add_meta_box( 'nav-menu-theme-locations', __( 'Theme Locations' ), 'wp_nav_menu_locations_meta_box' , 'nav-menus', 'side', 'default' );
-       add_meta_box( 'add-custom-links', __('Custom Links'), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
        wp_nav_menu_post_type_meta_boxes();
+       add_meta_box( 'add-custom-links', __( 'Custom Links' ), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
        wp_nav_menu_taxonomy_meta_boxes();
 
        // Register advanced menu items (columns)
-       add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns');
+       add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns' );
 
        // If first time editing, disable advanced items by default.
-       if( false === get_user_option( 'managenav-menuscolumnshidden' ) ) {
+       if ( false === get_user_option( 'managenav-menuscolumnshidden' ) ) {
                $user = wp_get_current_user();
                update_user_option($user->ID, 'managenav-menuscolumnshidden',
-                       array( 0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', ),
+                       array( 0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', 4 => 'title-attribute', ),
                        true);
        }
 }
 
 /**
- * Limit the amount of meta boxes to just links, pages and cats for first time users.
+ * Limit the amount of meta boxes to pages, posts, links, and categories for first time users.
  *
  * @since 3.0.0
+ *
+ * @global array $wp_meta_boxes
  **/
 function wp_initial_nav_menu_meta_boxes() {
        global $wp_meta_boxes;
@@ -411,7 +154,7 @@ function wp_initial_nav_menu_meta_boxes() {
        if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) )
                return;
 
-       $initial_meta_boxes = array( 'nav-menu-theme-locations', 'add-custom-links', 'add-page', 'add-category' );
+       $initial_meta_boxes = array( 'add-post-type-page', 'add-post-type-post', 'add-custom-links', 'add-category' );
        $hidden_meta_boxes = array();
 
        foreach ( array_keys($wp_meta_boxes['nav-menus']) as $context ) {
@@ -442,10 +185,24 @@ function wp_nav_menu_post_type_meta_boxes() {
                return;
 
        foreach ( $post_types as $post_type ) {
+               /**
+                * Filter whether a menu items meta box will be added for the current
+                * object type.
+                *
+                * If a falsey value is returned instead of an object, the menu items
+                * meta box for the current meta box object will not be added.
+                *
+                * @since 3.0.0
+                *
+                * @param object $meta_box_object The current object to add a menu items
+                *                                meta box for.
+                */
                $post_type = apply_filters( 'nav_menu_meta_box_object', $post_type );
                if ( $post_type ) {
                        $id = $post_type->name;
-                       add_meta_box( "add-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', 'default', $post_type );
+                       // Give pages a higher priority.
+                       $priority = ( 'page' == $post_type->name ? 'core' : 'default' );
+                       add_meta_box( "add-post-type-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type );
                }
        }
 }
@@ -462,6 +219,7 @@ function wp_nav_menu_taxonomy_meta_boxes() {
                return;
 
        foreach ( $taxonomies as $tax ) {
+               /** This filter is documented in wp-admin/includes/nav-menu.php */
                $tax = apply_filters( 'nav_menu_meta_box_object', $tax );
                if ( $tax ) {
                        $id = $tax->name;
@@ -471,98 +229,54 @@ function wp_nav_menu_taxonomy_meta_boxes() {
 }
 
 /**
- * Displays a metabox for the nav menu theme locations.
+ * Check whether to disable the Menu Locations meta box submit button
  *
- * @since 3.0.0
+ * @since 3.6.0
+ *
+ * @global bool $one_theme_location_no_menus to determine if no menus exist
+ *
+ * @param int|string $nav_menu_selected_id (id, name or slug) of the currently-selected menu
+ * @return string Disabled attribute if at least one menu exists, false if not
  */
-function wp_nav_menu_locations_meta_box() {
-       global $nav_menu_selected_id;
+function wp_nav_menu_disabled_check( $nav_menu_selected_id ) {
+       global $one_theme_location_no_menus;
 
-       if ( ! current_theme_supports( 'menus' ) ) {
-               // We must only support widgets. Leave a message and bail.
-               echo '<p class="howto">' . __('The current theme does not natively support menus, but you can use the &#8220;Custom Menu&#8221; widget to add any menus you create here to the theme&#8217;s sidebar.') . '</p>';
-               return;
-       }
+       if ( $one_theme_location_no_menus )
+               return false;
 
-       $locations = get_registered_nav_menus();
-       $menus = wp_get_nav_menus();
-       $menu_locations = get_nav_menu_locations();
-       $num_locations = count( array_keys($locations) );
-
-       echo '<p class="howto">' . sprintf( _n('Your theme supports %s menu. Select which menu you would like to use.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n($num_locations) ) . '</p>';
-
-       foreach ( $locations as $location => $description ) {
-               ?>
-               <p>
-                       <label class="howto" for="locations-<?php echo $location; ?>">
-                               <span><?php echo $description; ?></span>
-                               <select name="menu-locations[<?php echo $location; ?>]" id="locations-<?php echo $location; ?>">
-                                       <option value="0"></option>
-                                       <?php foreach ( $menus as $menu ) : ?>
-                                       <option<?php selected( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $menu->term_id ); ?>
-                                               value="<?php echo $menu->term_id; ?>"><?php
-                                               $truncated_name = wp_html_excerpt( $menu->name, 40 );
-                                               echo $truncated_name == $menu->name ? $menu->name : trim( $truncated_name ) . '&hellip;';
-                                       ?></option>
-                                       <?php endforeach; ?>
-                               </select>
-                       </label>
-               </p>
-       <?php
-       }
-       ?>
-       <p class="button-controls">
-               <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-               <?php submit_button( __( 'Save' ), 'primary', 'nav-menu-locations', false, disabled( $nav_menu_selected_id, 0, false ) ); ?>
-       </p>
-       <?php
+       return disabled( $nav_menu_selected_id, 0 );
 }
 
 /**
  * Displays a metabox for the custom links menu item.
  *
  * @since 3.0.0
+ *
+ * @global int        $_nav_menu_placeholder
+ * @global int|string $nav_menu_selected_id
  */
 function wp_nav_menu_item_link_meta_box() {
        global $_nav_menu_placeholder, $nav_menu_selected_id;
-       $_nav_menu_placeholder = 0 > $_nav_menu_placeholder ? $_nav_menu_placeholder - 1 : -1;
 
-       $current_tab = 'create';
-       if ( isset( $_REQUEST['customlink-tab'] ) && in_array( $_REQUEST['customlink-tab'], array('create', 'all') ) ) {
-               $current_tab = $_REQUEST['customlink-tab'];
-       }
-
-       $removed_args = array(
-               'action',
-               'customlink-tab',
-               'edit-menu-item',
-               'menu-item',
-               'page-tab',
-               '_wpnonce',
-       );
+       $_nav_menu_placeholder = 0 > $_nav_menu_placeholder ? $_nav_menu_placeholder - 1 : -1;
 
        ?>
        <div class="customlinkdiv" id="customlinkdiv">
+               <input type="hidden" value="custom" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-type]" />
+               <p id="menu-item-url-wrap" class="wp-clearfix">
+                       <label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
+                       <input id="custom-menu-item-url" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-url]" type="text" class="code menu-item-textbox" value="http://" />
+               </p>
 
-                       <input type="hidden" value="custom" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-type]" />
-                       <p id="menu-item-url-wrap">
-                               <label class="howto" for="custom-menu-item-url">
-                                       <span><?php _e('URL'); ?></span>
-                                       <input id="custom-menu-item-url" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-url]" type="text" class="code menu-item-textbox" value="http://" />
-                               </label>
-                       </p>
-
-                       <p id="menu-item-name-wrap">
-                               <label class="howto" for="custom-menu-item-name">
-                                       <span><?php _e('Label'); ?></span>
-                                       <input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text" class="regular-text menu-item-textbox input-with-default-title" title="<?php esc_attr_e('Menu Item'); ?>" />
-                               </label>
-                       </p>
+               <p id="menu-item-name-wrap" class="wp-clearfix">
+                       <label class="howto" for="custom-menu-item-name"><?php _e( 'Link Text' ); ?></label>
+                       <input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text" class="regular-text menu-item-textbox" />
+               </p>
 
-               <p class="button-controls">
+               <p class="button-controls wp-clearfix">
                        <span class="add-to-menu">
-                               <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-                               <input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
+                               <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
+                               <span class="spinner"></span>
                        </span>
                </p>
 
@@ -575,6 +289,9 @@ function wp_nav_menu_item_link_meta_box() {
  *
  * @since 3.0.0
  *
+ * @global int        $_nav_menu_placeholder
+ * @global int|string $nav_menu_selected_id
+ *
  * @param string $object Not used.
  * @param string $post_type The post type object.
  */
@@ -583,7 +300,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
 
        $post_type_name = $post_type['args']->name;
 
-       // paginate browsing for large numbers of post objects
+       // Paginate browsing for large numbers of post objects.
        $per_page = 50;
        $pagenum = isset( $_REQUEST[$post_type_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
        $offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
@@ -610,8 +327,6 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
                return;
        }
 
-       $post_type_object = get_post_type_object($post_type_name);
-
        $num_pages = $get_posts->max_num_pages;
 
        $page_links = paginate_links( array(
@@ -630,9 +345,6 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
                'current' => $pagenum
        ));
 
-       if ( !$posts )
-               $error = '<li id="error">'. $post_type['args']->labels->not_found .'</li>';
-
        $db_fields = false;
        if ( is_post_type_hierarchical( $post_type_name ) ) {
                $db_fields = array( 'parent' => 'post_parent', 'id' => 'ID' );
@@ -661,10 +373,22 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
        ?>
        <div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
                <ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
-                       <li <?php echo ( 'most-recent' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="nav-tab-link" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent"><?php _e('Most Recent'); ?></a></li>
-                       <li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="nav-tab-link" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#<?php echo $post_type_name; ?>-all"><?php _e('View All'); ?></a></li>
-                       <li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="nav-tab-link" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search"><?php _e('Search'); ?></a></li>
-               </ul>
+                       <li <?php echo ( 'most-recent' == $current_tab ? ' class="tabs"' : '' ); ?>>
+                               <a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
+                                       <?php _e( 'Most Recent' ); ?>
+                               </a>
+                       </li>
+                       <li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
+                               <a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#<?php echo $post_type_name; ?>-all">
+                                       <?php _e( 'View All' ); ?>
+                               </a>
+                       </li>
+                       <li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
+                               <a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
+                                       <?php _e( 'Search'); ?>
+                               </a>
+                       </li>
+               </ul><!-- .posttype-tabs -->
 
                <div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel <?php
                        echo ( 'most-recent' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
@@ -674,6 +398,21 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
                                $recent_args = array_merge( $args, array( 'orderby' => 'post_date', 'order' => 'DESC', 'posts_per_page' => 15 ) );
                                $most_recent = $get_posts->query( $recent_args );
                                $args['walker'] = $walker;
+
+                               /**
+                                * Filter the posts displayed in the 'Most Recent' tab of the current
+                                * post type's menu items meta box.
+                                *
+                                * The dynamic portion of the hook name, `$post_type_name`, refers to the post type name.
+                                *
+                                * @since 4.3.0
+                                *
+                                * @param array  $most_recent An array of post objects being listed.
+                                * @param array  $args        An array of WP_Query arguments.
+                                * @param object $post_type   The current post type object for this menu item meta box.
+                                */
+                               $most_recent = apply_filters( "nav_menu_items_{$post_type_name}_recent", $most_recent, $args, $post_type );
+
                                echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args );
                                ?>
                        </ul>
@@ -692,12 +431,13 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
                        }
                        ?>
                        <p class="quick-search-wrap">
-                               <input type="text" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" />
-                               <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-                               <?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
+                               <label for="quick-search-posttype-<?php echo $post_type_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
+                               <input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" id="quick-search-posttype-<?php echo $post_type_name; ?>" />
+                               <span class="spinner"></span>
+                               <?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
                        </p>
 
-                       <ul id="<?php echo $post_type_name; ?>-search-checklist" class="list:<?php echo $post_type_name?> categorychecklist form-no-clear">
+                       <ul id="<?php echo $post_type_name; ?>-search-checklist" data-wp-lists="list:<?php echo $post_type_name?>" class="categorychecklist form-no-clear">
                        <?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
                                <?php
                                $args['walker'] = $walker;
@@ -711,7 +451,6 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
                        </ul>
                </div><!-- /.tabs-panel -->
 
-
                <div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php
                        echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
                ?>">
@@ -720,22 +459,24 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
                                        <?php echo $page_links; ?>
                                </div>
                        <?php endif; ?>
-                       <ul id="<?php echo $post_type_name; ?>checklist" class="list:<?php echo $post_type_name?> categorychecklist form-no-clear">
+                       <ul id="<?php echo $post_type_name; ?>checklist" data-wp-lists="list:<?php echo $post_type_name?>" class="categorychecklist form-no-clear">
                                <?php
                                $args['walker'] = $walker;
 
-                               // if we're dealing with pages, let's put a checkbox for the front page at the top of the list
+                               /*
+                                * If we're dealing with pages, let's put a checkbox for the front
+                                * page at the top of the list.
+                                */
                                if ( 'page' == $post_type_name ) {
                                        $front_page = 'page' == get_option('show_on_front') ? (int) get_option( 'page_on_front' ) : 0;
                                        if ( ! empty( $front_page ) ) {
                                                $front_page_obj = get_post( $front_page );
-                                               $front_page_obj->_add_to_top = true;
-                                               $front_page_obj->label = sprintf( _x('Home: %s', 'nav menu front page title'), $front_page_obj->post_title );
+                                               $front_page_obj->front_or_home = true;
                                                array_unshift( $posts, $front_page_obj );
                                        } else {
                                                $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
                                                array_unshift( $posts, (object) array(
-                                                       '_add_to_top' => true,
+                                                       'front_or_home' => true,
                                                        'ID' => 0,
                                                        'object_id' => $_nav_menu_placeholder,
                                                        'post_content' => '',
@@ -749,7 +490,39 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
                                        }
                                }
 
-                               $posts = apply_filters( 'nav_menu_items_'.$post_type_name, $posts, $args, $post_type );
+                               $post_type = get_post_type_object( $post_type_name );
+                               $archive_link = get_post_type_archive_link( $post_type_name );
+                               if ( $post_type->has_archive ) {
+                                       $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
+                                       array_unshift( $posts, (object) array(
+                                               'ID' => 0,
+                                               'object_id' => $_nav_menu_placeholder,
+                                               'object'     => $post_type_name,
+                                               'post_content' => '',
+                                               'post_excerpt' => '',
+                                               'post_title' => $post_type->labels->archives,
+                                               'post_type' => 'nav_menu_item',
+                                               'type' => 'post_type_archive',
+                                               'url' => get_post_type_archive_link( $post_type_name ),
+                                       ) );
+                               }
+
+                               /**
+                                * Filter the posts displayed in the 'View All' tab of the current
+                                * post type's menu items meta box.
+                                *
+                                * The dynamic portion of the hook name, `$post_type_name`, refers
+                                * to the slug of the current post type.
+                                *
+                                * @since 3.2.0
+                                *
+                                * @see WP_Query::query()
+                                *
+                                * @param array  $posts     The posts for the current post type.
+                                * @param array  $args      An array of WP_Query arguments.
+                                * @param object $post_type The current post type object for this menu item meta box.
+                                */
+                               $posts = apply_filters( "nav_menu_items_{$post_type_name}", $posts, $args, $post_type );
                                $checkbox_items = walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $posts), 0, (object) $args );
 
                                if ( 'all' == $current_tab && ! empty( $_REQUEST['selectall'] ) ) {
@@ -767,23 +540,22 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
                        <?php endif; ?>
                </div><!-- /.tabs-panel -->
 
-
-               <p class="button-controls">
+               <p class="button-controls wp-clearfix">
                        <span class="list-controls">
                                <a href="<?php
-                                       echo esc_url(add_query_arg(
+                                       echo esc_url( add_query_arg(
                                                array(
                                                        $post_type_name . '-tab' => 'all',
                                                        'selectall' => 1,
                                                ),
-                                               remove_query_arg($removed_args)
+                                               remove_query_arg( $removed_args )
                                        ));
                                ?>#posttype-<?php echo $post_type_name; ?>" class="select-all"><?php _e('Select All'); ?></a>
                        </span>
 
                        <span class="add-to-menu">
-                               <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-                               <input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-post-type-menu-item" id="submit-posttype-<?php echo $post_type_name; ?>" />
+                               <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr( 'submit-posttype-' . $post_type_name ); ?>" />
+                               <span class="spinner"></span>
                        </span>
                </p>
 
@@ -796,6 +568,8 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
  *
  * @since 3.0.0
  *
+ * @global int|string $nav_menu_selected_id
+ *
  * @param string $object Not used.
  * @param string $taxonomy The taxonomy object.
  */
@@ -803,7 +577,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
        global $nav_menu_selected_id;
        $taxonomy_name = $taxonomy['args']->name;
 
-       // paginate browsing for large numbers of objects
+       // Paginate browsing for large numbers of objects.
        $per_page = 50;
        $pagenum = isset( $_REQUEST[$taxonomy_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
        $offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
@@ -814,7 +588,6 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
                'hide_empty' => false,
                'hierarchical' => 1,
                'include' => '',
-               'include_last_update_time' => false,
                'number' => $per_page,
                'offset' => $offset,
                'order' => 'ASC',
@@ -875,10 +648,22 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
        ?>
        <div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
                <ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
-                       <li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="nav-tab-link" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop"><?php _e('Most Used'); ?></a></li>
-                       <li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="nav-tab-link" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all"><?php _e('View All'); ?></a></li>
-                       <li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="nav-tab-link" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>"><?php _e('Search'); ?></a></li>
-               </ul>
+                       <li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>>
+                               <a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
+                                       <?php _e( 'Most Used' ); ?>
+                               </a>
+                       </li>
+                       <li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
+                               <a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
+                                       <?php _e( 'View All' ); ?>
+                               </a>
+                       </li>
+                       <li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
+                               <a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
+                                       <?php _e( 'Search' ); ?>
+                               </a>
+                       </li>
+               </ul><!-- .taxonomy-tabs -->
 
                <div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel <?php
                        echo ( 'most-used' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
@@ -900,7 +685,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
                                        <?php echo $page_links; ?>
                                </div>
                        <?php endif; ?>
-                       <ul id="<?php echo $taxonomy_name; ?>checklist" class="list:<?php echo $taxonomy_name?> categorychecklist form-no-clear">
+                       <ul id="<?php echo $taxonomy_name; ?>checklist" data-wp-lists="list:<?php echo $taxonomy_name?>" class="categorychecklist form-no-clear">
                                <?php
                                $args['walker'] = $walker;
                                echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $terms), 0, (object) $args );
@@ -926,12 +711,13 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
                        }
                        ?>
                        <p class="quick-search-wrap">
-                               <input type="text" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
-                               <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-                               <?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
+                               <label for="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
+                               <input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" id="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
+                               <span class="spinner"></span>
+                               <?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
                        </p>
 
-                       <ul id="<?php echo $taxonomy_name; ?>-search-checklist" class="list:<?php echo $taxonomy_name?> categorychecklist form-no-clear">
+                       <ul id="<?php echo $taxonomy_name; ?>-search-checklist" data-wp-lists="list:<?php echo $taxonomy_name?>" class="categorychecklist form-no-clear">
                        <?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
                                <?php
                                $args['walker'] = $walker;
@@ -945,7 +731,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
                        </ul>
                </div><!-- /.tabs-panel -->
 
-               <p class="button-controls">
+               <p class="button-controls wp-clearfix">
                        <span class="list-controls">
                                <a href="<?php
                                        echo esc_url(add_query_arg(
@@ -959,8 +745,8 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
                        </span>
 
                        <span class="add-to-menu">
-                               <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-                               <input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-taxonomy-menu-item" id="submit-taxonomy-<?php echo $taxonomy_name; ?>" />
+                               <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr( 'submit-taxonomy-' . $taxonomy_name ); ?>" />
+                               <span class="spinner"></span>
                        </span>
                </p>
 
@@ -983,21 +769,26 @@ function wp_save_nav_menu_items( $menu_id = 0, $menu_data = array() ) {
 
        if ( 0 == $menu_id || is_nav_menu( $menu_id ) ) {
 
-               // Loop through all the menu items' POST values
-               foreach( (array) $menu_data as $_possible_db_id => $_item_object_data ) {
+               // Loop through all the menu items' POST values.
+               foreach ( (array) $menu_data as $_possible_db_id => $_item_object_data ) {
                        if (
-                               empty( $_item_object_data['menu-item-object-id'] ) && // checkbox is not checked
+                               // Checkbox is not checked.
+                               empty( $_item_object_data['menu-item-object-id'] ) &&
                                (
-                                       ! isset( $_item_object_data['menu-item-type'] ) || // and item type either isn't set
-                                       in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) || // or URL is the default
-                                       ! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) ||  // or it's not a custom menu item (but not the custom home page)
-                                       ! empty( $_item_object_data['menu-item-db-id'] ) // or it *is* a custom menu item that already exists
+                                       // And item type either isn't set.
+                                       ! isset( $_item_object_data['menu-item-type'] ) ||
+                                       // Or URL is the default.
+                                       in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) ||
+                                       ! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) || // or it's not a custom menu item (but not the custom home page)
+                                       // Or it *is* a custom menu item that already exists.
+                                       ! empty( $_item_object_data['menu-item-db-id'] )
                                )
                        ) {
-                               continue; // then this potential menu item is not getting added to this menu
+                               // Then this potential menu item is not getting added to this menu.
+                               continue;
                        }
 
-                       // if this possible menu item doesn't actually have a menu database ID yet
+                       // If this possible menu item doesn't actually have a menu database ID yet.
                        if (
                                empty( $_item_object_data['menu-item-db-id'] ) ||
                                ( 0 > $_possible_db_id ) ||
@@ -1050,20 +841,20 @@ function _wp_nav_menu_meta_box_object( $object = null ) {
                                'post_status' => 'publish',
                        );
 
-               // posts should show only published items
+               // Posts should show only published items.
                } elseif ( 'post' == $object->name ) {
                        $object->_default_query = array(
                                'post_status' => 'publish',
                        );
 
-               // cats should be in reverse chronological order
+               // Categories should be in reverse chronological order.
                } elseif ( 'category' == $object->name ) {
                        $object->_default_query = array(
                                'orderby' => 'id',
                                'order' => 'DESC',
                        );
 
-               // custom post types should show only published items
+               // Custom post types should show only published items.
                } else {
                        $object->_default_query = array(
                                'post_status' => 'publish',
@@ -1079,7 +870,7 @@ function _wp_nav_menu_meta_box_object( $object = null ) {
  *
  * @since 3.0.0
  *
- * @param string $menu_id The ID of the menu to format.
+ * @param int $menu_id Optional. The ID of the menu to format. Default 0.
  * @return string|WP_Error $output The menu formatted to edit or error object on failure.
  */
 function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
@@ -1090,21 +881,35 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
                $menu_items = wp_get_nav_menu_items( $menu->term_id, array('post_status' => 'any') );
                $result = '<div id="menu-instructions" class="post-body-plain';
                $result .= ( ! empty($menu_items) ) ? ' menu-instructions-inactive">' : '">';
-               $result .= '<p>' . __('Select menu items (pages, categories, links) from the boxes at left to begin building your custom menu.') . '</p>';
+               $result .= '<p>' . __( 'Add menu items from the column on the left.' ) . '</p>';
                $result .= '</div>';
 
-               if( empty($menu_items) )
+               if ( empty($menu_items) )
                        return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
 
+               /**
+                * Filter the Walker class used when adding nav menu items.
+                *
+                * @since 3.0.0
+                *
+                * @param string $class   The walker class to use. Default 'Walker_Nav_Menu_Edit'.
+                * @param int    $menu_id ID of the menu being rendered.
+                */
                $walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id );
 
-               if ( class_exists( $walker_class_name ) )
+               if ( class_exists( $walker_class_name ) ) {
                        $walker = new $walker_class_name;
-               else
-                       return new WP_Error( 'menu_walker_not_exist', sprintf( __('The Walker class named <strong>%s</strong> does not exist.'), $walker_class_name ) );
+               } else {
+                       return new WP_Error( 'menu_walker_not_exist',
+                               /* translators: %s: walker class name */
+                               sprintf( __( 'The Walker class named %s does not exist.' ),
+                                       '<strong>' . $walker_class_name . '</strong>'
+                               )
+                       );
+               }
 
                $some_pending_menu_items = $some_invalid_menu_items = false;
-               foreach( (array) $menu_items as $menu_item ) {
+               foreach ( (array) $menu_items as $menu_item ) {
                        if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status )
                                $some_pending_menu_items = true;
                        if ( ! empty( $menu_item->_invalid ) )
@@ -1125,7 +930,6 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
                return $menu;
        }
 
-
 }
 
 /**
@@ -1133,16 +937,17 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
  *
  * @since 3.0.0
  *
- * @return string|WP_Error $output The menu formatted to edit or error object on failure.
+ * @return array Columns.
  */
 function wp_nav_menu_manage_columns() {
        return array(
-               '_title' => __('Show advanced menu properties'),
-               'cb' => '<input type="checkbox" />',
-               'link-target' => __('Link Target'),
-               'css-classes' => __('CSS Classes'),
-               'xfn' => __('Link Relationship (XFN)'),
-               'description' => __('Description'),
+               '_title'          => __( 'Show advanced menu properties' ),
+               'cb'              => '<input type="checkbox" />',
+               'link-target'     => __( 'Link Target' ),
+               'title-attribute' => __( 'Title Attribute' ),
+               'css-classes'     => __( 'CSS Classes' ),
+               'xfn'             => __( 'Link Relationship (XFN)' ),
+               'description'     => __( 'Description' ),
        );
 }
 
@@ -1152,18 +957,103 @@ function wp_nav_menu_manage_columns() {
  * @access private
  * @since 3.0.0
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
  */
 function _wp_delete_orphaned_draft_menu_items() {
        global $wpdb;
-       $delete_timestamp = time() - (60*60*24*EMPTY_TRASH_DAYS);
+       $delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
 
-       // delete orphaned draft menu items
+       // Delete orphaned draft menu items.
        $menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp ) );
 
-       foreach( (array) $menu_items_to_delete as $menu_item_id )
+       foreach ( (array) $menu_items_to_delete as $menu_item_id )
                wp_delete_post( $menu_item_id, true );
 }
 
-add_action('admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items');
+/**
+ * Saves nav menu items
+ *
+ * @since 3.6.0
+ *
+ * @param int|string $nav_menu_selected_id (id, slug, or name ) of the currently-selected menu
+ * @param string $nav_menu_selected_title Title of the currently-selected menu
+ * @return array $messages The menu updated message
+ */
+function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_selected_title ) {
+       $unsorted_menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID', 'post_status' => 'draft,publish' ) );
+       $messages = array();
+       $menu_items = array();
+       // Index menu items by db ID
+       foreach ( $unsorted_menu_items as $_item )
+               $menu_items[$_item->db_id] = $_item;
+
+       $post_fields = array(
+               'menu-item-db-id', 'menu-item-object-id', 'menu-item-object',
+               'menu-item-parent-id', 'menu-item-position', 'menu-item-type',
+               'menu-item-title', 'menu-item-url', 'menu-item-description',
+               'menu-item-attr-title', 'menu-item-target', 'menu-item-classes', 'menu-item-xfn'
+       );
+
+       wp_defer_term_counting( true );
+       // Loop through all the menu items' POST variables
+       if ( ! empty( $_POST['menu-item-db-id'] ) ) {
+               foreach ( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
+
+                       // Menu item title can't be blank
+                       if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] )
+                               continue;
 
-?>
+                       $args = array();
+                       foreach ( $post_fields as $field )
+                               $args[$field] = isset( $_POST[$field][$_key] ) ? $_POST[$field][$_key] : '';
+
+                       $menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key ), $args );
+
+                       if ( is_wp_error( $menu_item_db_id ) ) {
+                               $messages[] = '<div id="message" class="error"><p>' . $menu_item_db_id->get_error_message() . '</p></div>';
+                       } else {
+                               unset( $menu_items[ $menu_item_db_id ] );
+                       }
+               }
+       }
+
+       // Remove menu items from the menu that weren't in $_POST
+       if ( ! empty( $menu_items ) ) {
+               foreach ( array_keys( $menu_items ) as $menu_item_id ) {
+                       if ( is_nav_menu_item( $menu_item_id ) ) {
+                               wp_delete_post( $menu_item_id );
+                       }
+               }
+       }
+
+       // Store 'auto-add' pages.
+       $auto_add = ! empty( $_POST['auto-add-pages'] );
+       $nav_menu_option = (array) get_option( 'nav_menu_options' );
+       if ( ! isset( $nav_menu_option['auto_add'] ) )
+               $nav_menu_option['auto_add'] = array();
+       if ( $auto_add ) {
+               if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) )
+                       $nav_menu_option['auto_add'][] = $nav_menu_selected_id;
+       } else {
+               if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) )
+                       unset( $nav_menu_option['auto_add'][$key] );
+       }
+       // Remove nonexistent/deleted menus
+       $nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );
+       update_option( 'nav_menu_options', $nav_menu_option );
+
+       wp_defer_term_counting( false );
+
+       /** This action is documented in wp-includes/nav-menu.php */
+       do_action( 'wp_update_nav_menu', $nav_menu_selected_id );
+
+       $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' .
+               /* translators: %s: nav menu title */
+               sprintf( __( '%s has been updated.' ),
+                       '<strong>' . $nav_menu_selected_title . '</strong>'
+               ) . '</p></div>';
+
+       unset( $menu_items, $unsorted_menu_items );
+
+       return $messages;
+}