WordPress 4.4
[autoinstalls/wordpress.git] / wp-admin / nav-menus.php
index bbee8d620a7f27ea91e0eead5ecd6569965d6572..6507f0dc5654c5bf734dd743d6ed7f11b63d230f 100644 (file)
@@ -10,7 +10,7 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( './admin.php' );
+require_once( dirname( __FILE__ ) . '/admin.php' );
 
 // Load all the nav menu interface functions
 require_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
@@ -19,8 +19,13 @@ if ( ! current_theme_supports( 'menus' ) && ! current_theme_supports( 'widgets'
        wp_die( __( 'Your theme does not support navigation menus or widgets.' ) );
 
 // Permissions Check
-if ( ! current_user_can('edit_theme_options') )
-       wp_die( __( 'Cheatin’ uh?' ) );
+if ( ! current_user_can( 'edit_theme_options' ) ) {
+       wp_die(
+               '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+               '<p>' . __( 'You are not allowed to edit theme options on this site.' ) . '</p>',
+               403
+       );
+}
 
 wp_enqueue_script( 'nav-menu' );
 
@@ -53,7 +58,8 @@ switch ( $action ) {
                        wp_save_nav_menu_items( $nav_menu_selected_id, $_REQUEST['menu-item'] );
                break;
        case 'move-down-menu-item' :
-               // moving down a menu item is the same as moving up the next in order
+
+               // Moving down a menu item is the same as moving up the next in order.
                check_admin_referer( 'move-menu_item' );
                $menu_item_id = isset( $_REQUEST['menu-item'] ) ? (int) $_REQUEST['menu-item'] : 0;
                if ( is_nav_menu_item( $menu_item_id ) ) {
@@ -63,10 +69,10 @@ switch ( $action ) {
                                $ordered_menu_items = wp_get_nav_menu_items( $menu_id );
                                $menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
 
-                               // set up the data we need in one pass through the array of menu items
+                               // Set up the data we need in one pass through the array of menu items.
                                $dbids_to_orders = array();
                                $orders_to_dbids = array();
-                               foreach( (array) $ordered_menu_items as $ordered_menu_item_object ) {
+                               foreach ( (array) $ordered_menu_items as $ordered_menu_item_object ) {
                                        if ( isset( $ordered_menu_item_object->ID ) ) {
                                                if ( isset( $ordered_menu_item_object->menu_order ) ) {
                                                        $dbids_to_orders[$ordered_menu_item_object->ID] = $ordered_menu_item_object->menu_order;
@@ -75,14 +81,14 @@ switch ( $action ) {
                                        }
                                }
 
-                               // get next in order
+                               // Get next in order.
                                if (
                                        isset( $orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1] )
                                ) {
                                        $next_item_id = $orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1];
                                        $next_item_data = (array) wp_setup_nav_menu_item( get_post( $next_item_id ) );
 
-                                       // if not siblings of same parent, bubble menu item up but keep order
+                                       // If not siblings of same parent, bubble menu item up but keep order.
                                        if (
                                                ! empty( $menu_item_data['menu_item_parent'] ) &&
                                                (
@@ -102,7 +108,7 @@ switch ( $action ) {
 
                                                }
 
-                                       // make menu item a child of its next sibling
+                                       // Make menu item a child of its next sibling.
                                        } else {
                                                $next_item_data['menu_order'] = $next_item_data['menu_order'] - 1;
                                                $menu_item_data['menu_order'] = $menu_item_data['menu_order'] + 1;
@@ -114,7 +120,7 @@ switch ( $action ) {
                                                wp_update_post($next_item_data);
                                        }
 
-                               // the item is last but still has a parent, so bubble up
+                               // The item is last but still has a parent, so bubble up.
                                } elseif (
                                        ! empty( $menu_item_data['menu_item_parent'] ) &&
                                        in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids )
@@ -136,10 +142,10 @@ switch ( $action ) {
                                $ordered_menu_items = wp_get_nav_menu_items( $menu_id );
                                $menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
 
-                               // set up the data we need in one pass through the array of menu items
+                               // Set up the data we need in one pass through the array of menu items.
                                $dbids_to_orders = array();
                                $orders_to_dbids = array();
-                               foreach( (array) $ordered_menu_items as $ordered_menu_item_object ) {
+                               foreach ( (array) $ordered_menu_items as $ordered_menu_item_object ) {
                                        if ( isset( $ordered_menu_item_object->ID ) ) {
                                                if ( isset( $ordered_menu_item_object->menu_order ) ) {
                                                        $dbids_to_orders[$ordered_menu_item_object->ID] = $ordered_menu_item_object->menu_order;
@@ -148,10 +154,10 @@ switch ( $action ) {
                                        }
                                }
 
-                               // if this menu item is not first
+                               // If this menu item is not first.
                                if ( ! empty( $dbids_to_orders[$menu_item_id] ) && ! empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ) {
 
-                                       // if this menu item is a child of the previous
+                                       // If this menu item is a child of the previous.
                                        if (
                                                ! empty( $menu_item_data['menu_item_parent'] ) &&
                                                in_array( $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ) ) &&
@@ -164,7 +170,10 @@ switch ( $action ) {
                                                if ( ! is_wp_error( $parent_object ) ) {
                                                        $parent_data = (array) $parent_object;
 
-                                                       // if there is something before the parent and parent a child of it, make menu item a child also of it
+                                                       /*
+                                                        * If there is something before the parent and parent a child of it,
+                                                        * make menu item a child also of it.
+                                                        */
                                                        if (
                                                                ! empty( $dbids_to_orders[$parent_db_id] ) &&
                                                                ! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] ) &&
@@ -172,7 +181,10 @@ switch ( $action ) {
                                                        ) {
                                                                $menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
 
-                                                       // else if there is something before parent and parent not a child of it, make menu item a child of that something's parent
+                                                       /*
+                                                        * Else if there is something before parent and parent not a child of it,
+                                                        * make menu item a child of that something's parent
+                                                        */
                                                        } elseif (
                                                                ! empty( $dbids_to_orders[$parent_db_id] ) &&
                                                                ! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] )
@@ -183,24 +195,24 @@ switch ( $action ) {
                                                                else
                                                                        $menu_item_data['menu_item_parent'] = 0;
 
-                                                       // else there isn't something before the parent
+                                                       // Else there isn't something before the parent.
                                                        } else {
                                                                $menu_item_data['menu_item_parent'] = 0;
                                                        }
 
-                                                       // set former parent's [menu_order] to that of menu-item's
+                                                       // Set former parent's [menu_order] to that of menu-item's.
                                                        $parent_data['menu_order'] = $parent_data['menu_order'] + 1;
 
-                                                       // set menu-item's [menu_order] to that of former parent
+                                                       // Set menu-item's [menu_order] to that of former parent.
                                                        $menu_item_data['menu_order'] = $menu_item_data['menu_order'] - 1;
 
-                                                       // save changes
+                                                       // Save changes.
                                                        update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
                                                        wp_update_post($menu_item_data);
                                                        wp_update_post($parent_data);
                                                }
 
-                                       // else this menu item is not a child of the previous
+                                       // Else this menu item is not a child of the previous.
                                        } elseif (
                                                empty( $menu_item_data['menu_order'] ) ||
                                                empty( $menu_item_data['menu_item_parent'] ) ||
@@ -208,7 +220,7 @@ switch ( $action ) {
                                                empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ||
                                                $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] != $menu_item_data['menu_item_parent']
                                        ) {
-                                               // just make it a child of the previous; keep the order
+                                               // Just make it a child of the previous; keep the order.
                                                $menu_item_data['menu_item_parent'] = (int) $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1];
                                                update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
                                                wp_update_post($menu_item_data);
@@ -224,7 +236,7 @@ switch ( $action ) {
                check_admin_referer( 'delete-menu_item_' . $menu_item_id );
 
                if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) )
-                       $messages[] = '<div id="message" class="updated"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
+                       $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
                break;
 
        case 'delete':
@@ -232,7 +244,7 @@ switch ( $action ) {
                if ( is_nav_menu( $nav_menu_selected_id ) ) {
                        $deletion = wp_delete_nav_menu( $nav_menu_selected_id );
                } else {
-                       // Reset the selected menu
+                       // Reset the selected menu.
                        $nav_menu_selected_id = 0;
                        unset( $_REQUEST['menu'] );
                }
@@ -241,9 +253,9 @@ switch ( $action ) {
                        break;
 
                if ( is_wp_error( $deletion ) )
-                       $messages[] = '<div id="message" class="error"><p>' . $deletion->get_error_message() . '</p></div>';
+                       $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';
                else
-                       $messages[] = '<div id="message" class="updated"><p>' . __( 'The menu has been successfully deleted.' ) . '</p></div>';
+                       $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'The menu has been successfully deleted.' ) . '</p></div>';
                break;
 
        case 'delete_menus':
@@ -254,34 +266,34 @@ switch ( $action ) {
 
                        $deletion = wp_delete_nav_menu( $menu_id_to_delete );
                        if ( is_wp_error( $deletion ) ) {
-                               $messages[] = '<div id="message" class="error"><p>' . $deletion->get_error_message() . '</p></div>';
+                               $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';
                                $deletion_error = true;
                        }
                }
 
                if ( empty( $deletion_error ) )
-                       $messages[] = '<div id="message" class="updated"><p>' . __( 'Selected menus have been successfully deleted.' ) . '</p></div>';
+                       $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Selected menus have been successfully deleted.' ) . '</p></div>';
                break;
 
        case 'update':
                check_admin_referer( 'update-nav_menu', 'update-nav-menu-nonce' );
 
-               // Remove menu locations that have been unchecked
+               // Remove menu locations that have been unchecked.
                foreach ( $locations as $location => $description ) {
                        if ( ( empty( $_POST['menu-locations'] ) || empty( $_POST['menu-locations'][ $location ] ) ) && isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id )
                                unset( $menu_locations[ $location ] );
                }
 
-               // Merge new and existing menu locations if any new ones are set
+               // Merge new and existing menu locations if any new ones are set.
                if ( isset( $_POST['menu-locations'] ) ) {
                        $new_menu_locations = array_map( 'absint', $_POST['menu-locations'] );
                        $menu_locations = array_merge( $menu_locations, $new_menu_locations );
                }
 
-               // Set menu locations
+               // Set menu locations.
                set_theme_mod( 'nav_menu_locations', $menu_locations );
 
-               // Add Menu
+               // Add Menu.
                if ( 0 == $nav_menu_selected_id ) {
                        $new_menu_title = trim( esc_html( $_POST['menu-name'] ) );
 
@@ -289,7 +301,7 @@ switch ( $action ) {
                                $_nav_menu_selected_id = wp_update_nav_menu_object( 0, array('menu-name' => $new_menu_title) );
 
                                if ( is_wp_error( $_nav_menu_selected_id ) ) {
-                                       $messages[] = '<div id="message" class="error"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
+                                       $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
                                } else {
                                        $_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
                                        $nav_menu_selected_id = $_nav_menu_selected_id;
@@ -314,22 +326,23 @@ switch ( $action ) {
                                                        $menu_locations[ $_REQUEST['use-location'] ] = $nav_menu_selected_id;
                                                set_theme_mod( 'nav_menu_locations', $menu_locations );
                                        }
+
                                        // $messages[] = '<div id="message" class="updated"><p>' . sprintf( __( '<strong>%s</strong> has been created.' ), $nav_menu_selected_title ) . '</p></div>';
                                        wp_redirect( admin_url( 'nav-menus.php?menu=' . $_nav_menu_selected_id ) );
                                        exit();
                                }
                        } else {
-                               $messages[] = '<div id="message" class="error"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';
+                               $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';
                        }
 
-               // Update existing menu
+               // Update existing menu.
                } else {
 
                        $_menu_object = wp_get_nav_menu_object( $nav_menu_selected_id );
 
                        $menu_title = trim( esc_html( $_POST['menu-name'] ) );
                        if ( ! $menu_title ) {
-                               $messages[] = '<div id="message" class="error"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';
+                               $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';
                                $menu_title = $_menu_object->name;
                        }
 
@@ -337,16 +350,22 @@ switch ( $action ) {
                                $_nav_menu_selected_id = wp_update_nav_menu_object( $nav_menu_selected_id, array( 'menu-name' => $menu_title ) );
                                if ( is_wp_error( $_nav_menu_selected_id ) ) {
                                        $_menu_object = $_nav_menu_selected_id;
-                                       $messages[] = '<div id="message" class="error"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
+                                       $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
                                } else {
                                        $_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
                                        $nav_menu_selected_title = $_menu_object->name;
                                }
                        }
 
-                       // Update menu items
+                       // Update menu items.
                        if ( ! is_wp_error( $_menu_object ) ) {
-                               $messages = array_merge( $messages, wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title ) );
+                               $messages = array_merge( $messages, wp_nav_menu_update_menu_items( $_nav_menu_selected_id, $nav_menu_selected_title ) );
+
+                               // If the menu ID changed, redirect to the new URL.
+                               if ( $nav_menu_selected_id != $_nav_menu_selected_id ) {
+                                       wp_redirect( admin_url( 'nav-menus.php?menu=' . intval( $_nav_menu_selected_id ) ) );
+                                       exit();
+                               }
                        }
                }
                break;
@@ -366,13 +385,13 @@ switch ( $action ) {
                        // Set menu locations
                        set_theme_mod( 'nav_menu_locations', $menu_locations );
 
-                       $messages[] = '<div id="message" class="updated"><p>' . __( 'Menu locations updated.' ) . '</p></div>';
+                       $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Menu locations updated.' ) . '</p></div>';
                }
                break;
 }
 
-// Get all nav menus
-$nav_menus = wp_get_nav_menus( array('orderby' => 'name') );
+// Get all nav menus.
+$nav_menus = wp_get_nav_menus();
 $menu_count = count( $nav_menus );
 
 // Are we on the add new screen?
@@ -380,7 +399,10 @@ $add_new_screen = ( isset( $_GET['menu'] ) && 0 == $_GET['menu'] ) ? true : fals
 
 $locations_screen = ( isset( $_GET['action'] ) && 'locations' == $_GET['action'] ) ? true : false;
 
-// If we have one theme location, and zero menus, we take them right into editing their first menu
+/*
+ * If we have one theme location, and zero menus, we take them right
+ * into editing their first menu.
+ */
 $page_count = wp_count_posts( 'page' );
 $one_theme_location_no_menus = ( 1 == count( get_registered_nav_menus() ) && ! $add_new_screen && empty( $nav_menus ) && ! empty( $page_count->publish ) ) ? true : false;
 
@@ -404,32 +426,35 @@ $nav_menus_l10n = array(
 );
 wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n );
 
-// Redirect to add screen if there are no menus and this users has either zero, or more than 1 theme locations
+/*
+ * Redirect to add screen if there are no menus and this users has either zero,
+ * or more than 1 theme locations.
+ */
 if ( 0 == $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus )
        wp_redirect( admin_url( 'nav-menus.php?action=edit&menu=0' ) );
 
-// Get recently edited nav menu
+// Get recently edited nav menu.
 $recently_edited = absint( get_user_option( 'nav_menu_recently_edited' ) );
 if ( empty( $recently_edited ) && is_nav_menu( $nav_menu_selected_id ) )
        $recently_edited = $nav_menu_selected_id;
 
-// Use $recently_edited if none are selected
+// Use $recently_edited if none are selected.
 if ( empty( $nav_menu_selected_id ) && ! isset( $_GET['menu'] ) && is_nav_menu( $recently_edited ) )
        $nav_menu_selected_id = $recently_edited;
 
-// On deletion of menu, if another menu exists, show it
+// On deletion of menu, if another menu exists, show it.
 if ( ! $add_new_screen && 0 < $menu_count && isset( $_GET['action'] ) && 'delete' == $_GET['action'] )
        $nav_menu_selected_id = $nav_menus[0]->term_id;
 
-// Set $nav_menu_selected_id to 0 if no menus
+// Set $nav_menu_selected_id to 0 if no menus.
 if ( $one_theme_location_no_menus ) {
        $nav_menu_selected_id = 0;
 } elseif ( empty( $nav_menu_selected_id ) && ! empty( $nav_menus ) && ! $add_new_screen ) {
-       // if we have no selection yet, and we have menus, set to the first one in the list
+       // if we have no selection yet, and we have menus, set to the first one in the list.
        $nav_menu_selected_id = $nav_menus[0]->term_id;
 }
 
-// Update the user's setting
+// Update the user's setting.
 if ( $nav_menu_selected_id != $recently_edited && is_nav_menu( $nav_menu_selected_id ) )
        update_user_meta( $current_user->ID, 'nav_menu_recently_edited', $nav_menu_selected_id );
 
@@ -439,29 +464,40 @@ if ( ! $nav_menu_selected_title && is_nav_menu( $nav_menu_selected_id ) ) {
        $nav_menu_selected_title = ! is_wp_error( $_menu_object ) ? $_menu_object->name : '';
 }
 
-// Generate truncated menu names
-foreach( (array) $nav_menus as $key => $_nav_menu ) {
+// Generate truncated menu names.
+foreach ( (array) $nav_menus as $key => $_nav_menu ) {
        $nav_menus[$key]->truncated_name = wp_html_excerpt( $_nav_menu->name, 40, '&hellip;' );
 }
 
-// Retrieve menu locations
+// Retrieve menu locations.
 if ( current_theme_supports( 'menus' ) ) {
        $locations = get_registered_nav_menus();
        $menu_locations = get_nav_menu_locations();
 }
 
-// Ensure the user will be able to scroll horizontally
-// by adding a class for the max menu depth.
+/*
+ * Ensure the user will be able to scroll horizontally
+ * by adding a class for the max menu depth.
+ *
+ * @global int $_wp_nav_menu_max_depth
+ */
 global $_wp_nav_menu_max_depth;
 $_wp_nav_menu_max_depth = 0;
 
-// Calling wp_get_nav_menu_to_edit generates $_wp_nav_menu_max_depth
+// Calling wp_get_nav_menu_to_edit generates $_wp_nav_menu_max_depth.
 if ( is_nav_menu( $nav_menu_selected_id ) ) {
        $menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'post_status' => 'any' ) );
        $edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id );
 }
 
-function wp_nav_menu_max_depth($classes) {
+/**
+ *
+ * @global int $_wp_nav_menu_max_depth
+ *
+ * @param string $classes
+ * @return string
+ */
+function wp_nav_menu_max_depth( $classes ) {
        global $_wp_nav_menu_max_depth;
        return "$classes menu-max-depth-$_wp_nav_menu_max_depth";
 }
@@ -472,11 +508,11 @@ wp_nav_menu_setup();
 wp_initial_nav_menu_meta_boxes();
 
 if ( ! current_theme_supports( 'menus' ) && ! $num_locations )
-       $messages[] = '<div id="message" class="updated"><p>' . sprintf( __( 'Your theme does not natively support menus, but you can use them in sidebars by adding a &#8220;Custom Menus&#8221; widget on the <a href="%s">Widgets</a> screen.' ), admin_url( 'widgets.php' ) ) . '</p></div>';
+       $messages[] = '<div id="message" class="updated"><p>' . sprintf( __( 'Your theme does not natively support menus, but you can use them in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%s">Widgets</a> screen.' ), admin_url( 'widgets.php' ) ) . '</p></div>';
 
 if ( ! $locations_screen ) : // Main tab
        $overview  = '<p>' . __( 'This screen is used for managing your custom navigation menus.' ) . '</p>';
-       $overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a &#8220;Custom Menus&#8221; widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the custom menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Thirteen', 'Twenty Twelve' ) . '</p>';
+       $overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the custom menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Fifteen', 'Twenty Fourteen' ) . '</p>';
        $overview .= '<p>' . __( 'From this screen you can:' ) . '</p>';
        $overview .= '<ul><li>' . __( 'Create, edit, and delete menus' ) . '</li>';
        $overview .= '<li>' . __( 'Add, organize, and modify individual menu items' ) . '</li></ul>';
@@ -499,9 +535,9 @@ if ( ! $locations_screen ) : // Main tab
        ) );
 
        $editing_menus  = '<p>' . __( 'Each custom menu may contain a mix of links to pages, categories, custom URLs or other content types. Menu links are added by selecting items from the expanding boxes in the left-hand column below.' ) . '</p>';
-       $editing_menus .= '<p>' . __( '<strong>Clicking the title of any menu item</strong> in the editor will reveal a standard group of settings. Additional settings such as link target, CSS classes, link relationships, and link descriptions can be enabled and disabled via the Screen Options tab.' ) . '</p>';
+       $editing_menus .= '<p>' . __( '<strong>Clicking the arrow to the right of any menu item</strong> in the editor will reveal a standard group of settings. Additional settings such as link target, CSS classes, link relationships, and link descriptions can be enabled and disabled via the Screen Options tab.' ) . '</p>';
        $editing_menus .= '<ul><li>' . __( 'Add one or several items at once by <strong>selecting the checkbox next to each item and clicking Add to Menu</strong>' ) . '</li>';
-       $editing_menus .= '<li>' . __( 'To add a custom link, <strong>expand the Links section, enter a URL and link text, and click Add to Menu</strong>' ) .'</li>';
+       $editing_menus .= '<li>' . __( 'To add a custom link, <strong>expand the Custom Links section, enter a URL and link text, and click Add to Menu</strong>' ) .'</li>';
        $editing_menus .= '<li>' . __( 'To reorganize menu items, <strong>drag and drop items with your mouse or use your keyboard</strong>. Drag or move a menu item a little to the right to make it a submenu' ) . '</li>';
        $editing_menus .= '<li>' . __( 'Delete a menu item by <strong>expanding it and clicking the Remove link</strong>' ) . '</li></ul>';
 
@@ -510,7 +546,7 @@ if ( ! $locations_screen ) : // Main tab
                'title'   => __( 'Editing Menus' ),
                'content' => $editing_menus
        ) );
-else : // Locations Tab
+else : // Locations Tab.
        $locations_overview  = '<p>' . __( 'This screen is used for globally assigning menus to locations defined by your theme.' ) . '</p>';
        $locations_overview .= '<ul><li>' . __( 'To assign menus to one or more theme locations, <strong>select a menu from each location&#8217;s drop down.</strong> When you&#8217;re finished, <strong>click Save Changes</strong>' ) . '</li>';
        $locations_overview .= '<li>' . __( 'To edit a menu currently assigned to a theme location, <strong>click the adjacent &#8217;Edit&#8217; link</strong>' ) . '</li>';
@@ -525,49 +561,63 @@ endif;
 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
-       '<p>' . __('<a href="http://codex.wordpress.org/Appearance_Menus_Screen" target="_blank">Documentation on Menus</a>') . '</p>' .
-       '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+       '<p>' . __('<a href="https://codex.wordpress.org/Appearance_Menus_Screen" target="_blank">Documentation on Menus</a>') . '</p>' .
+       '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
-// Get the admin header
-require_once( './admin-header.php' );
+// Get the admin header.
+require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <div class="wrap">
-       <?php screen_icon(); ?>
+       <h1><?php echo esc_html( __( 'Menus' ) ); ?>
+               <?php
+               if ( current_user_can( 'customize' ) ) :
+                       $focus = $locations_screen ? array( 'section' => 'menu_locations' ) : array( 'panel' => 'nav_menus' );
+                       printf(
+                               ' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
+                               esc_url( add_query_arg( array(
+                                       array( 'autofocus' => $focus ),
+                                       'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
+                               ), admin_url( 'customize.php' ) ) ),
+                               __( 'Manage in Customizer' )
+                       );
+               endif;
+               ?>
+       </h1>
        <h2 class="nav-tab-wrapper">
                <a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
                <?php if ( $num_locations && $menu_count ) : ?>
                        <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php if ( $locations_screen ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
-               <?php endif; ?>
+               <?php
+                       endif;
+               ?>
        </h2>
        <?php
-       foreach( $messages as $message ) :
+       foreach ( $messages as $message ) :
                echo $message . "\n";
        endforeach;
        ?>
        <?php
        if ( $locations_screen ) :
-               echo '<p>' . sprintf( _n( 'Your theme supports %s menu. Select which menu you would like to use below.', 'Your theme supports %s menus. Select a menu to use for each theme location below.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
+               if ( 1 == $num_locations ) {
+                       echo '<p>' . __( 'Your theme supports one menu. Select which menu you would like to use.' ) . '</p>';
+               } else {
+                       echo '<p>' .  sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
+               }
        ?>
        <div id="menu-locations-wrap">
                <form method="post" action="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>">
-                       <table class="widefat fixed" cellspacing="0" id="menu-locations-table">
+                       <table class="widefat fixed" id="menu-locations-table">
                                <thead>
                                <tr>
                                        <th scope="col" class="manage-column column-locations"><?php _e( 'Theme Location' ); ?></th>
                                        <th scope="col" class="manage-column column-menus"><?php _e( 'Assigned Menu' ); ?></th>
                                </tr>
                                </thead>
-                               <!--<tfoot>
-                               <tr>
-                                       <th scope="col" class="manage-column column-locations"><?php _e( 'Theme Location' ); ?></th>
-                                       <th scope="col" class="manage-column column-menus"><?php _e( 'Assigned Menu' ); ?></th>
-                               </tr>
-                               </tfoot>-->
                                <tbody class="menu-locations">
                                <?php foreach ( $locations as $_location => $_name ) { ?>
-                                       <tr id="menu-locations-row">
-                                               <td class="menu-location-title"><strong><?php echo $_name; ?></strong></td>
+                                       <tr class="menu-locations-row">
+                                               <td class="menu-location-title"><label for="locations-<?php echo $_location; ?>"><?php echo $_name; ?></label></td>
                                                <td class="menu-location-menus">
                                                        <select name="menu-locations[<?php echo $_location; ?>]" id="locations-<?php echo $_location; ?>">
                                                                <option value="0"><?php printf( '&mdash; %s &mdash;', esc_html__( 'Select a Menu' ) ); ?></option>
@@ -582,7 +632,7 @@ require_once( './admin-header.php' );
                                                                <?php if ( isset( $menu_locations[ $_location ] ) && 0 != $menu_locations[ $_location ] ) : ?>
                                                                <span class="locations-edit-menu-link">
                                                                        <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => $menu_locations[$_location] ), admin_url( 'nav-menus.php' ) ) ); ?>">
-                                                                               <?php _ex( 'Edit', 'menu' ); ?>
+                                                                               <span aria-hidden="true"><?php _ex( 'Edit', 'menu' ); ?></span><span class="screen-reader-text"><?php _e( 'Edit selected menu' ); ?></span>
                                                                        </a>
                                                                </span>
                                                                <?php endif; ?>
@@ -591,9 +641,9 @@ require_once( './admin-header.php' );
                                                                                <?php _ex( 'Use new menu', 'menu' ); ?>
                                                                        </a>
                                                                </span>
-                                                       </div><!-- #locations-row-links -->
+                                                       </div><!-- .locations-row-links -->
                                                </td><!-- .menu-location-menus -->
-                                       </tr><!-- #menu-locations-row -->
+                                       </tr><!-- .menu-locations-row -->
                                <?php } // foreach ?>
                                </tbody>
                        </table>
@@ -602,7 +652,13 @@ require_once( './admin-header.php' );
                        <input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
                </form>
        </div><!-- #menu-locations-wrap -->
-       <?php do_action( 'after_menu_locations_table' ); ?>
+       <?php
+       /**
+        * Fires after the menu locations table is displayed.
+        *
+        * @since 3.6.0
+        */
+       do_action( 'after_menu_locations_table' ); ?>
        <?php else : ?>
        <div class="manage-menus">
                <?php if ( $menu_count < 2 ) : ?>
@@ -612,12 +668,12 @@ require_once( './admin-header.php' );
                <?php else : ?>
                        <form method="get" action="<?php echo admin_url( 'nav-menus.php' ); ?>">
                        <input type="hidden" name="action" value="edit" />
-                       <label for="menu" class="selected-menu"><?php _e( 'Select a menu to edit:' ); ?></label>
-                       <select name="menu" id="menu">
+                       <label for="select-menu-to-edit" class="selected-menu"><?php _e( 'Select a menu to edit:' ); ?></label>
+                       <select name="menu" id="select-menu-to-edit">
                                <?php if ( $add_new_screen ) : ?>
-                                       <option value="0" selected="selected"><?php _e( '-- Select --' ); ?></option>
+                                       <option value="0" selected="selected"><?php _e( '&mdash; Select &mdash;' ); ?></option>
                                <?php endif; ?>
-                               <?php foreach( (array) $nav_menus as $_nav_menu ) : ?>
+                               <?php foreach ( (array) $nav_menus as $_nav_menu ) : ?>
                                        <option value="<?php echo esc_attr( $_nav_menu->term_id ); ?>" <?php selected( $_nav_menu->term_id, $nav_menu_selected_id ); ?>>
                                                <?php
                                                echo esc_html( $_nav_menu->truncated_name ) ;
@@ -625,21 +681,33 @@ require_once( './admin-header.php' );
                                                if ( ! empty( $menu_locations ) && in_array( $_nav_menu->term_id, $menu_locations ) ) {
                                                        $locations_assigned_to_this_menu = array();
                                                        foreach ( array_keys( $menu_locations, $_nav_menu->term_id ) as $menu_location_key ) {
-                                                                $locations_assigned_to_this_menu[] = $locations[ $menu_location_key ];
+                                                               if ( isset( $locations[ $menu_location_key ] ) ) {
+                                                                       $locations_assigned_to_this_menu[] = $locations[ $menu_location_key ];
+                                                               }
                                                        }
+
+                                                       /**
+                                                        * Filter the number of locations listed per menu in the drop-down select.
+                                                        *
+                                                        * @since 3.6.0
+                                                        *
+                                                        * @param int $locations Number of menu locations to list. Default 3.
+                                                        */
                                                        $assigned_locations = array_slice( $locations_assigned_to_this_menu, 0, absint( apply_filters( 'wp_nav_locations_listed_per_menu', 3 ) ) );
 
-                                                       // Adds ellipses following the number of locations defined in $assigned_locations
-                                                       printf( ' (%1$s%2$s)',
-                                                               implode( ', ', $assigned_locations ),
-                                                               count( $locations_assigned_to_this_menu ) > count( $assigned_locations ) ? ' &hellip;' : ''
-                                                       );
+                                                       // Adds ellipses following the number of locations defined in $assigned_locations.
+                                                       if ( ! empty( $assigned_locations ) ) {
+                                                               printf( ' (%1$s%2$s)',
+                                                                       implode( ', ', $assigned_locations ),
+                                                                       count( $locations_assigned_to_this_menu ) > count( $assigned_locations ) ? ' &hellip;' : ''
+                                                               );
+                                                       }
                                                }
                                                ?>
                                        </option>
                                <?php endforeach; ?>
                        </select>
-                       <span class="submit-btn"><input type="submit" class="button-secondary" value="<?php _e( 'Select' ); ?>"></span>
+                       <span class="submit-btn"><input type="submit" class="button-secondary" value="<?php esc_attr_e( 'Select' ); ?>"></span>
                        <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' ) ) ) ); ?>
                        </span><!-- /add-new-menu-action -->
@@ -651,7 +719,7 @@ require_once( './admin-header.php' );
 
                <div class="clear"></div>
 
-               <form id="nav-menu-meta" action="" class="nav-menu-meta" method="post" enctype="multipart/form-data">
+               <form id="nav-menu-meta" class="nav-menu-meta" method="post" enctype="multipart/form-data">
                        <input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
                        <input type="hidden" name="action" value="add-menu-item" />
                        <?php wp_nonce_field( 'add-menu_item', 'menu-settings-column-nonce' ); ?>
@@ -661,7 +729,7 @@ require_once( './admin-header.php' );
        </div><!-- /#menu-settings-column -->
        <div id="menu-management-liquid">
                <div id="menu-management">
-                       <form id="update-nav-menu" action="" method="post" enctype="multipart/form-data">
+                       <form id="update-nav-menu" method="post" enctype="multipart/form-data">
                                <div class="menu-edit <?php if ( $add_new_screen ) echo 'blank-slate'; ?>">
                                        <?php
                                        wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
@@ -730,9 +798,15 @@ require_once( './admin-header.php' );
                                                                                <dt class="howto"><?php _e( 'Theme locations' ); ?></dt>
                                                                                <?php foreach ( $locations as $location => $description ) : ?>
                                                                                <dd class="checkbox-input">
-                                                                                       <input type="checkbox"<?php checked( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ); ?> name="menu-locations[<?php echo esc_attr( $location ); ?>]" id="locations-<?php echo esc_attr( $location ); ?>" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" /> <label for="locations-<?php echo esc_attr( $location ); ?>"><?php echo $description; ?></label>
+                                                                                       <input type="checkbox"<?php checked( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ); ?> name="menu-locations[<?php echo esc_attr( $location ); ?>]" id="locations-<?php echo esc_attr( $location ); ?>" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
+                                                                                       <label for="locations-<?php echo esc_attr( $location ); ?>"><?php echo $description; ?></label>
                                                                                        <?php if ( ! empty( $menu_locations[ $location ] ) && $menu_locations[ $location ] != $nav_menu_selected_id ) : ?>
-                                                                                       <span class="theme-location-set"> <?php printf( __( "(Currently set to: %s)" ), wp_get_nav_menu_object( $menu_locations[ $location ] )->name ); ?> </span>
+                                                                                               <span class="theme-location-set"><?php 
+                                                                                                       /* translators: %s: menu name */
+                                                                                                       printf( _x( '(Currently set to: %s)', 'menu location' ),
+                                                                                                               wp_get_nav_menu_object( $menu_locations[ $location ] )->name
+                                                                                                       );
+                                                                                               ?></span>
                                                                                        <?php endif; ?>
                                                                                </dd>
                                                                                <?php endforeach; ?>
@@ -751,7 +825,7 @@ require_once( './admin-header.php' );
                                                        </span><!-- END .delete-action -->
                                                        <?php endif; ?>
                                                        <div class="publishing-action">
-                                                               <?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false, array( 'id' => 'save_menu_header' ) ); ?>
+                                                               <?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false, array( 'id' => 'save_menu_footer' ) ); ?>
                                                        </div><!-- END .publishing-action -->
                                                </div><!-- END .major-publishing-actions -->
                                        </div><!-- /#nav-menu-footer -->
@@ -762,4 +836,4 @@ require_once( './admin-header.php' );
        </div><!-- /#nav-menus-frame -->
        <?php endif; ?>
 </div><!-- /.wrap-->
-<?php include( './admin-footer.php' ); ?>
+<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>