--- a/wp/wp-admin/nav-menus.php Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/nav-menus.php Mon Oct 14 18:28:13 2019 +0200
@@ -15,8 +15,9 @@
// Load all the nav menu interface functions
require_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
-if ( ! current_theme_supports( 'menus' ) && ! current_theme_supports( 'widgets' ) )
+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' ) ) {
@@ -29,8 +30,9 @@
wp_enqueue_script( 'nav-menu' );
-if ( wp_is_mobile() )
+if ( wp_is_mobile() ) {
wp_enqueue_script( 'jquery-touch-punch' );
+}
// Container for any messages displayed to the user
$messages = array();
@@ -42,9 +44,9 @@
$nav_menu_selected_id = isset( $_REQUEST['menu'] ) ? (int) $_REQUEST['menu'] : 0;
// Get existing menu locations assignments
-$locations = get_registered_nav_menus();
+$locations = get_registered_nav_menus();
$menu_locations = get_nav_menu_locations();
-$num_locations = count( array_keys( $locations ) );
+$num_locations = count( array_keys( $locations ) );
// Allowed actions: add, update, delete
$action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'edit';
@@ -58,22 +60,22 @@
switch ( $action ) {
case 'add-menu-item':
check_admin_referer( 'add-menu_item', 'menu-settings-column-nonce' );
- if ( isset( $_REQUEST['nav-menu-locations'] ) )
+ if ( isset( $_REQUEST['nav-menu-locations'] ) ) {
set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_REQUEST['menu-locations'] ) );
- elseif ( isset( $_REQUEST['menu-item'] ) )
+ } elseif ( isset( $_REQUEST['menu-item'] ) ) {
wp_save_nav_menu_items( $nav_menu_selected_id, $_REQUEST['menu-item'] );
+ }
break;
- case 'move-down-menu-item' :
-
+ case 'move-down-menu-item':
// 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 ) ) {
$menus = isset( $_REQUEST['menu'] ) ? array( (int) $_REQUEST['menu'] ) : wp_get_object_terms( $menu_item_id, 'nav_menu', array( 'fields' => 'ids' ) );
if ( ! is_wp_error( $menus ) && ! empty( $menus[0] ) ) {
- $menu_id = (int) $menus[0];
+ $menu_id = (int) $menus[0];
$ordered_menu_items = wp_get_nav_menu_items( $menu_id );
- $menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_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.
$dbids_to_orders = array();
@@ -81,17 +83,17 @@
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;
- $orders_to_dbids[$ordered_menu_item_object->menu_order] = $ordered_menu_item_object->ID;
+ $dbids_to_orders[ $ordered_menu_item_object->ID ] = $ordered_menu_item_object->menu_order;
+ $orders_to_dbids[ $ordered_menu_item_object->menu_order ] = $ordered_menu_item_object->ID;
}
}
}
// Get next in order.
if (
- isset( $orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1] )
+ 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_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.
@@ -108,13 +110,13 @@
$parent_object = wp_setup_nav_menu_item( get_post( $parent_db_id ) );
if ( ! is_wp_error( $parent_object ) ) {
- $parent_data = (array) $parent_object;
+ $parent_data = (array) $parent_object;
$menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
}
- // 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;
@@ -122,31 +124,31 @@
$menu_item_data['menu_item_parent'] = $next_item_data['ID'];
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($next_item_data);
+ wp_update_post( $menu_item_data );
+ 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 )
) {
- $menu_item_data['menu_item_parent'] = (int) get_post_meta( $menu_item_data['menu_item_parent'], '_menu_item_menu_item_parent', true);
+ $menu_item_data['menu_item_parent'] = (int) get_post_meta( $menu_item_data['menu_item_parent'], '_menu_item_menu_item_parent', true );
update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
}
}
}
break;
- case 'move-up-menu-item' :
+ case 'move-up-menu-item':
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 ) ) {
$menus = isset( $_REQUEST['menu'] ) ? array( (int) $_REQUEST['menu'] ) : wp_get_object_terms( $menu_item_id, 'nav_menu', array( 'fields' => 'ids' ) );
if ( ! is_wp_error( $menus ) && ! empty( $menus[0] ) ) {
- $menu_id = (int) $menus[0];
+ $menu_id = (int) $menus[0];
$ordered_menu_items = wp_get_nav_menu_items( $menu_id );
- $menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_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.
$dbids_to_orders = array();
@@ -154,23 +156,23 @@
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;
- $orders_to_dbids[$ordered_menu_item_object->menu_order] = $ordered_menu_item_object->ID;
+ $dbids_to_orders[ $ordered_menu_item_object->ID ] = $ordered_menu_item_object->menu_order;
+ $orders_to_dbids[ $ordered_menu_item_object->menu_order ] = $ordered_menu_item_object->ID;
}
}
}
// 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 ( ! 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 (
! empty( $menu_item_data['menu_item_parent'] ) &&
in_array( $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ) ) &&
- isset( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) &&
- ( $menu_item_data['menu_item_parent'] == $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] )
+ isset( $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] ) &&
+ ( $menu_item_data['menu_item_parent'] == $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] )
) {
- $parent_db_id = in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids ) ? (int) $menu_item_data['menu_item_parent'] : 0;
+ $parent_db_id = in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids ) ? (int) $menu_item_data['menu_item_parent'] : 0;
$parent_object = wp_setup_nav_menu_item( get_post( $parent_db_id ) );
if ( ! is_wp_error( $parent_object ) ) {
@@ -181,27 +183,28 @@
* 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] ) &&
+ ! empty( $dbids_to_orders[ $parent_db_id ] ) &&
+ ! empty( $orders_to_dbids[ $dbids_to_orders[ $parent_db_id ] - 1 ] ) &&
! empty( $parent_data['menu_item_parent'] )
) {
$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] )
+ ! empty( $dbids_to_orders[ $parent_db_id ] ) &&
+ ! empty( $orders_to_dbids[ $dbids_to_orders[ $parent_db_id ] - 1 ] )
) {
- $_possible_parent_id = (int) get_post_meta( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1], '_menu_item_menu_item_parent', true);
- if ( in_array( $_possible_parent_id, array_keys( $dbids_to_orders ) ) )
+ $_possible_parent_id = (int) get_post_meta( $orders_to_dbids[ $dbids_to_orders[ $parent_db_id ] - 1 ], '_menu_item_menu_item_parent', true );
+ if ( in_array( $_possible_parent_id, array_keys( $dbids_to_orders ) ) ) {
$menu_item_data['menu_item_parent'] = $_possible_parent_id;
- else
+ } 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;
}
@@ -214,22 +217,22 @@
// 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);
+ 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'] ) ||
! in_array( $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ) ) ||
- 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']
+ 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.
- $menu_item_data['menu_item_parent'] = (int) $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1];
+ $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);
+ wp_update_post( $menu_item_data );
}
}
}
@@ -241,8 +244,9 @@
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 notice is-dismissible"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
+ if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) ) {
+ $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'The menu item has been successfully deleted.' ) . '</p></div>';
+ }
break;
case 'delete':
@@ -255,30 +259,34 @@
unset( $_REQUEST['menu'] );
}
- if ( ! isset( $deletion ) )
+ if ( ! isset( $deletion ) ) {
break;
+ }
- if ( is_wp_error( $deletion ) )
+ if ( is_wp_error( $deletion ) ) {
$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';
- else
+ } else {
$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'The menu has been successfully deleted.' ) . '</p></div>';
+ }
break;
case 'delete_menus':
check_admin_referer( 'nav_menus_bulk_actions' );
foreach ( $_REQUEST['delete_menus'] as $menu_id_to_delete ) {
- if ( ! is_nav_menu( $menu_id_to_delete ) )
+ if ( ! is_nav_menu( $menu_id_to_delete ) ) {
continue;
+ }
$deletion = wp_delete_nav_menu( $menu_id_to_delete );
if ( is_wp_error( $deletion ) ) {
- $messages[] = '<div id="message" class="error notice is-dismissible"><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 ) )
+ if ( empty( $deletion_error ) ) {
$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Selected menus have been successfully deleted.' ) . '</p></div>';
+ }
break;
case 'update':
@@ -286,14 +294,15 @@
// 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 )
+ 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.
if ( isset( $_POST['menu-locations'] ) ) {
$new_menu_locations = array_map( 'absint', $_POST['menu-locations'] );
- $menu_locations = array_merge( $menu_locations, $new_menu_locations );
+ $menu_locations = array_merge( $menu_locations, $new_menu_locations );
}
// Set menu locations.
@@ -304,16 +313,17 @@
$new_menu_title = trim( esc_html( $_POST['menu-name'] ) );
if ( $new_menu_title ) {
- $_nav_menu_selected_id = wp_update_nav_menu_object( 0, array('menu-name' => $new_menu_title) );
+ $_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 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;
+ $_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
+ $nav_menu_selected_id = $_nav_menu_selected_id;
$nav_menu_selected_title = $_menu_object->name;
- if ( isset( $_REQUEST['menu-item'] ) )
+ if ( isset( $_REQUEST['menu-item'] ) ) {
wp_save_nav_menu_items( $nav_menu_selected_id, absint( $_REQUEST['menu-item'] ) );
+ }
if ( isset( $_REQUEST['zero-menu-state'] ) ) {
// If there are menu items, add them
wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title );
@@ -326,10 +336,11 @@
set_theme_mod( 'nav_menu_locations', $locations );
}
if ( isset( $_REQUEST['use-location'] ) ) {
- $locations = get_registered_nav_menus();
+ $locations = get_registered_nav_menus();
$menu_locations = get_nav_menu_locations();
- if ( isset( $locations[ $_REQUEST['use-location'] ] ) )
+ if ( isset( $locations[ $_REQUEST['use-location'] ] ) ) {
$menu_locations[ $_REQUEST['use-location'] ] = $nav_menu_selected_id;
+ }
set_theme_mod( 'nav_menu_locations', $menu_locations );
}
@@ -341,7 +352,7 @@
$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 );
@@ -356,9 +367,9 @@
$_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 notice is-dismissible"><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 );
+ $_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
$nav_menu_selected_title = $_menu_object->name;
}
}
@@ -387,7 +398,7 @@
check_admin_referer( 'save-menu-locations' );
$new_menu_locations = array_map( 'absint', $_POST['menu-locations'] );
- $menu_locations = array_merge( $menu_locations, $new_menu_locations );
+ $menu_locations = array_merge( $menu_locations, $new_menu_locations );
// Set menu locations
set_theme_mod( 'nav_menu_locations', $menu_locations );
@@ -397,7 +408,7 @@
}
// Get all nav menus.
-$nav_menus = wp_get_nav_menus();
+$nav_menus = wp_get_nav_menus();
$menu_count = count( $nav_menus );
// Are we on the add new screen?
@@ -409,26 +420,26 @@
* If we have one theme location, and zero menus, we take them right
* into editing their first menu.
*/
-$page_count = wp_count_posts( 'page' );
+$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;
$nav_menus_l10n = array(
'oneThemeLocationNoMenus' => $one_theme_location_no_menus,
- 'moveUp' => __( 'Move up one' ),
- 'moveDown' => __( 'Move down one' ),
- 'moveToTop' => __( 'Move to the top' ),
+ 'moveUp' => __( 'Move up one' ),
+ 'moveDown' => __( 'Move down one' ),
+ 'moveToTop' => __( 'Move to the top' ),
/* translators: %s: previous item name */
- 'moveUnder' => __( 'Move under %s' ),
+ 'moveUnder' => __( 'Move under %s' ),
/* translators: %s: previous item name */
- 'moveOutFrom' => __( 'Move out from under %s' ),
+ 'moveOutFrom' => __( 'Move out from under %s' ),
/* translators: %s: previous item name */
- 'under' => __( 'Under %s' ),
+ 'under' => __( 'Under %s' ),
/* translators: %s: previous item name */
- 'outFrom' => __( 'Out from under %s' ),
+ 'outFrom' => __( 'Out from under %s' ),
/* translators: 1: item name, 2: item position, 3: total number of items */
- 'menuFocus' => __( '%1$s. Menu item %2$d of %3$d.' ),
+ 'menuFocus' => __( '%1$s. Menu item %2$d of %3$d.' ),
/* translators: 1: item name, 2: item position, 3: parent item name */
- 'subMenuFocus' => __( '%1$s. Sub item number %2$d under %3$s.' ),
+ 'subMenuFocus' => __( '%1$s. Sub item number %2$d under %3$s.' ),
);
wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n );
@@ -436,21 +447,25 @@
* 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 )
+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.
$recently_edited = absint( get_user_option( 'nav_menu_recently_edited' ) );
-if ( empty( $recently_edited ) && is_nav_menu( $nav_menu_selected_id ) )
+if ( empty( $recently_edited ) && is_nav_menu( $nav_menu_selected_id ) ) {
$recently_edited = $nav_menu_selected_id;
+}
// Use $recently_edited if none are selected.
-if ( empty( $nav_menu_selected_id ) && ! isset( $_GET['menu'] ) && is_nav_menu( $recently_edited ) )
+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.
-if ( ! $add_new_screen && 0 < $menu_count && isset( $_GET['action'] ) && 'delete' == $_GET['action'] )
+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.
if ( $one_theme_location_no_menus ) {
@@ -461,23 +476,24 @@
}
// Update the user's setting.
-if ( $nav_menu_selected_id != $recently_edited && is_nav_menu( $nav_menu_selected_id ) )
+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 );
+}
// If there's a menu, get its name.
if ( ! $nav_menu_selected_title && is_nav_menu( $nav_menu_selected_id ) ) {
- $_menu_object = wp_get_nav_menu_object( $nav_menu_selected_id );
+ $_menu_object = wp_get_nav_menu_object( $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 ) {
- $nav_menus[$key]->truncated_name = wp_html_excerpt( $_nav_menu->name, 40, '…' );
+ $nav_menus[ $key ]->truncated_name = wp_html_excerpt( $_nav_menu->name, 40, '…' );
}
// Retrieve menu locations.
if ( current_theme_supports( 'menus' ) ) {
- $locations = get_registered_nav_menus();
+ $locations = get_registered_nav_menus();
$menu_locations = get_nav_menu_locations();
}
@@ -492,12 +508,11 @@
// 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' ) );
+ $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 );
}
/**
- *
* @global int $_wp_nav_menu_max_depth
*
* @param string $classes
@@ -508,68 +523,77 @@
return "$classes menu-max-depth-$_wp_nav_menu_max_depth";
}
-add_filter('admin_body_class', 'wp_nav_menu_max_depth');
+add_filter( 'admin_body_class', 'wp_nav_menu_max_depth' );
wp_nav_menu_setup();
wp_initial_nav_menu_meta_boxes();
-if ( ! current_theme_supports( 'menus' ) && ! $num_locations )
+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 “Navigation Menu” 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 navigation menus.' ) . '</p>';
+ $overview = '<p>' . __( 'This screen is used for managing your navigation menus.' ) . '</p>';
/* translators: 1: Widgets admin screen URL, 2 and 3: The name of the default themes */
- $overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a “Navigation Menu” widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the navigation 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 Sixteen', 'Twenty Seventeen' ) . '</p>';
+ $overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a “Navigation Menu” widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the navigation 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 Seventeen', 'Twenty Nineteen' ) . '</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>';
- get_current_screen()->add_help_tab( array(
- 'id' => 'overview',
- 'title' => __( 'Overview' ),
- 'content' => $overview
- ) );
+ get_current_screen()->add_help_tab(
+ array(
+ 'id' => 'overview',
+ 'title' => __( 'Overview' ),
+ 'content' => $overview,
+ )
+ );
$menu_management = '<p>' . __( 'The menu management box at the top of the screen is used to control which menu is opened in the editor below.' ) . '</p>';
$menu_management .= '<ul><li>' . __( 'To edit an existing menu, <strong>choose a menu from the drop down and click Select</strong>' ) . '</li>';
$menu_management .= '<li>' . __( 'If you haven’t yet created any menus, <strong>click the ’create a new menu’ link</strong> to get started' ) . '</li></ul>';
$menu_management .= '<p>' . __( 'You can assign theme locations to individual menus by <strong>selecting the desired settings</strong> at the bottom of the menu editor. To assign menus to all theme locations at once, <strong>visit the Manage Locations tab</strong> at the top of the screen.' ) . '</p>';
- get_current_screen()->add_help_tab( array(
- 'id' => 'menu-management',
- 'title' => __( 'Menu Management' ),
- 'content' => $menu_management
- ) );
+ get_current_screen()->add_help_tab(
+ array(
+ 'id' => 'menu-management',
+ 'title' => __( 'Menu Management' ),
+ 'content' => $menu_management,
+ )
+ );
$editing_menus = '<p>' . __( 'Each navigation 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 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 Custom 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>';
- get_current_screen()->add_help_tab( array(
- 'id' => 'editing-menus',
- 'title' => __( 'Editing Menus' ),
- 'content' => $editing_menus
- ) );
+ get_current_screen()->add_help_tab(
+ array(
+ 'id' => 'editing-menus',
+ 'title' => __( 'Editing Menus' ),
+ 'content' => $editing_menus,
+ )
+ );
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’s drop down.</strong> When you’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 ’Edit’ link</strong>' ) . '</li>';
$locations_overview .= '<li>' . __( 'To add a new menu instead of assigning an existing one, <strong>click the ’Use new menu’ link</strong>. Your new menu will be automatically assigned to that theme location' ) . '</li></ul>';
- get_current_screen()->add_help_tab( array(
- 'id' => 'locations-overview',
- 'title' => __( 'Overview' ),
- 'content' => $locations_overview
- ) );
+ get_current_screen()->add_help_tab(
+ array(
+ 'id' => 'locations-overview',
+ 'title' => __( 'Overview' ),
+ 'content' => $locations_overview,
+ )
+ );
endif;
get_current_screen()->set_help_sidebar(
- '<p><strong>' . __('For more information:') . '</strong></p>' .
- '<p>' . __('<a href="https://codex.wordpress.org/Appearance_Menus_Screen">Documentation on Menus</a>') . '</p>' .
- '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+ '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+ '<p>' . __( '<a href="https://codex.wordpress.org/Appearance_Menus_Screen">Documentation on Menus</a>' ) . '</p>' .
+ '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
);
// Get the admin header.
@@ -582,25 +606,45 @@
$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( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ),
- ), admin_url( 'customize.php' ) ) ),
+ esc_url(
+ add_query_arg(
+ array(
+ array( 'autofocus' => $focus ),
+ 'return' => urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ),
+ ),
+ admin_url( 'customize.php' )
+ )
+ ),
__( 'Manage with Live Preview' )
);
endif;
+
+ $nav_tab_active_class = '';
+ $nav_aria_current = '';
+ if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) {
+ $nav_tab_active_class = ' nav-tab-active';
+ $nav_aria_current = ' aria-current="page"';
+ }
?>
<hr class="wp-header-end">
- <h2 class="nav-tab-wrapper wp-clearfix">
- <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>
+ <nav class="nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
+ <a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php echo $nav_tab_active_class; ?>"<?php echo $nav_aria_current; ?>><?php esc_html_e( 'Edit Menus' ); ?></a>
<?php
- endif;
+ if ( $num_locations && $menu_count ) {
+ $active_tab_class = '';
+ $aria_current = '';
+ if ( $locations_screen ) {
+ $active_tab_class = ' nav-tab-active';
+ $aria_current = ' aria-current="page"';
+ }
+ ?>
+ <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php echo $active_tab_class; ?>"<?php echo $aria_current; ?>><?php esc_html_e( 'Manage Locations' ); ?></a>
+ <?php
+ }
?>
- </h2>
+ </nav>
<?php
foreach ( $messages as $message ) :
echo $message . "\n";
@@ -611,9 +655,9 @@
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>';
+ 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" id="menu-locations-table">
@@ -630,9 +674,15 @@
<td class="menu-location-menus">
<select name="menu-locations[<?php echo $_location; ?>]" id="locations-<?php echo $_location; ?>">
<option value="0"><?php printf( '— %s —', esc_html__( 'Select a Menu' ) ); ?></option>
- <?php foreach ( $nav_menus as $menu ) : ?>
- <?php $selected = isset( $menu_locations[$_location] ) && $menu_locations[$_location] == $menu->term_id; ?>
- <option <?php if ( $selected ) echo 'data-orig="true"'; ?> <?php selected( $selected ); ?> value="<?php echo $menu->term_id; ?>">
+ <?php
+ foreach ( $nav_menus as $menu ) :
+ $data_orig = '';
+ $selected = isset( $menu_locations[ $_location ] ) && $menu_locations[ $_location ] == $menu->term_id;
+ if ( $selected ) {
+ $data_orig = 'data-orig="true"';
+ }
+ ?>
+ <option <?php echo $data_orig; ?> <?php selected( $selected ); ?> value="<?php echo $menu->term_id; ?>">
<?php echo wp_html_excerpt( $menu->name, 40, '…' ); ?>
</option>
<?php endforeach; ?>
@@ -640,13 +690,38 @@
<div class="locations-row-links">
<?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' ) ) ); ?>">
+ <a href="
+ <?php
+ echo esc_url(
+ add_query_arg(
+ array(
+ 'action' => 'edit',
+ 'menu' => $menu_locations[ $_location ],
+ ),
+ admin_url( 'nav-menus.php' )
+ )
+ );
+ ?>
+ ">
<span aria-hidden="true"><?php _ex( 'Edit', 'menu' ); ?></span><span class="screen-reader-text"><?php _e( 'Edit selected menu' ); ?></span>
</a>
</span>
<?php endif; ?>
<span class="locations-add-menu-link">
- <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0, 'use-location' => $_location ), admin_url( 'nav-menus.php' ) ) ); ?>">
+ <a href="
+ <?php
+ echo esc_url(
+ add_query_arg(
+ array(
+ 'action' => 'edit',
+ 'menu' => 0,
+ 'use-location' => $_location,
+ ),
+ admin_url( 'nav-menus.php' )
+ )
+ );
+ ?>
+ ">
<?php _ex( 'Use new menu', 'menu' ); ?>
</a>
</span>
@@ -661,18 +736,38 @@
<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
- /**
- * Fires after the menu locations table is displayed.
- *
- * @since 3.6.0
- */
- 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 ) : ?>
+ <?php if ( $menu_count < 1 ) : ?>
+ <span class="first-menu-message">
+ <?php _e( 'Create your first menu below.' ); ?>
+ <span class="screen-reader-text"><?php _e( 'Fill in the Menu Name and click the Create Menu button to create your first menu.' ); ?></span>
+ </span><!-- /first-menu-message -->
+ <?php elseif ( $menu_count < 2 ) : ?>
<span class="add-edit-menu-action">
- <?php printf( __( 'Edit your menu below, or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
+ <?php
+ printf(
+ __( 'Edit your menu below, or <a href="%s">create a new menu</a>. Don’t forget to save your changes!' ),
+ esc_url(
+ add_query_arg(
+ array(
+ 'action' => 'edit',
+ 'menu' => 0,
+ ),
+ admin_url( 'nav-menus.php' )
+ )
+ )
+ );
+ ?>
+ <span class="screen-reader-text"><?php _e( 'Click the Save Menu button to save your changes.' ); ?></span>
</span><!-- /add-edit-menu-action -->
<?php else : ?>
<form method="get" action="<?php echo admin_url( 'nav-menus.php' ); ?>">
@@ -685,7 +780,7 @@
<?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 ) ;
+ echo esc_html( $_nav_menu->truncated_name );
if ( ! empty( $menu_locations ) && in_array( $_nav_menu->term_id, $menu_locations ) ) {
$locations_assigned_to_this_menu = array();
@@ -706,7 +801,8 @@
// Adds ellipses following the number of locations defined in $assigned_locations.
if ( ! empty( $assigned_locations ) ) {
- printf( ' (%1$s%2$s)',
+ printf(
+ ' (%1$s%2$s)',
implode( ', ', $assigned_locations ),
count( $locations_assigned_to_this_menu ) > count( $assigned_locations ) ? ' …' : ''
);
@@ -718,13 +814,34 @@
</select>
<span class="submit-btn"><input type="submit" class="button" 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' ) ) ) ); ?>
+ <?php
+ printf(
+ __( 'or <a href="%s">create a new menu</a>. Don’t forget to save your changes!' ),
+ esc_url(
+ add_query_arg(
+ array(
+ 'action' => 'edit',
+ 'menu' => 0,
+ ),
+ admin_url( 'nav-menus.php' )
+ )
+ )
+ );
+ ?>
+ <span class="screen-reader-text"><?php _e( 'Click the Save Menu button to save your changes.' ); ?></span>
</span><!-- /add-new-menu-action -->
</form>
- <?php endif; ?>
+ <?php
+ endif;
+
+ $metabox_holder_disabled_class = '';
+ if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
+ $metabox_holder_disabled_class = ' metabox-holder-disabled';
+ }
+ ?>
</div><!-- /manage-menus -->
<div id="nav-menus-frame" class="wp-clearfix">
- <div id="menu-settings-column" class="metabox-holder<?php if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) { echo ' metabox-holder-disabled'; } ?>">
+ <div id="menu-settings-column" class="metabox-holder<?php echo $metabox_holder_disabled_class; ?>">
<div class="clear"></div>
@@ -732,6 +849,7 @@
<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' ); ?>
+ <h2><?php _e( 'Add menu items' ); ?></h2>
<?php do_accordion_sections( 'nav-menus', 'side', null ); ?>
</form>
@@ -739,7 +857,14 @@
<div id="menu-management-liquid">
<div id="menu-management">
<form id="update-nav-menu" method="post" enctype="multipart/form-data">
- <div class="menu-edit <?php if ( $add_new_screen ) echo 'blank-slate'; ?>">
+ <?php
+ $new_screen_class = '';
+ if ( $add_new_screen ) {
+ $new_screen_class = 'blank-slate';
+ }
+ ?>
+ <h2><?php _e( 'Menu structure' ); ?></h2>
+ <div class="menu-edit <?php echo $new_screen_class; ?>">
<input type="hidden" name="nav-menu-data">
<?php
wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
@@ -750,12 +875,14 @@
if ( $one_theme_location_no_menus ) {
$menu_name_val = 'value="' . esc_attr( 'Menu 1' ) . '"';
- ?>
+ ?>
<input type="hidden" name="zero-menu-state" value="true" />
- <?php } else {
+ <?php
+ } else {
$menu_name_val = 'value="' . esc_attr( $nav_menu_selected_title ) . '"';
- } ?>
- <input type="hidden" name="action" value="update" />
+ }
+ ?>
+ <input type="hidden" name="action" value="update" />
<input type="hidden" name="menu" id="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
<div id="nav-menu-header">
<div class="major-publishing-actions wp-clearfix">
@@ -769,42 +896,56 @@
<div id="post-body">
<div id="post-body-content" class="wp-clearfix">
<?php if ( ! $add_new_screen ) : ?>
- <h3><?php _e( 'Menu Structure' ); ?></h3>
- <?php $starter_copy = ( $one_theme_location_no_menus ) ? __( 'Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes.' ) : __( 'Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options.' ); ?>
- <div class="drag-instructions post-body-plain" <?php if ( isset( $menu_items ) && 0 == count( $menu_items ) ) { ?>style="display: none;"<?php } ?>>
+ <?php
+ $hide_style = '';
+ if ( isset( $menu_items ) && 0 == count( $menu_items ) ) {
+ $hide_style = 'style="display: none;"';
+ }
+ $starter_copy = ( $one_theme_location_no_menus ) ? __( 'Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes.' ) : __( 'Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options.' );
+ ?>
+ <div class="drag-instructions post-body-plain" <?php echo $hide_style; ?>>
<p><?php echo $starter_copy; ?></p>
</div>
- <?php
- if ( isset( $edit_markup ) && ! is_wp_error( $edit_markup ) ) {
- echo $edit_markup;
- } else {
- ?>
+ <?php
+ if ( isset( $edit_markup ) && ! is_wp_error( $edit_markup ) ) {
+ echo $edit_markup;
+ } else {
+ ?>
<ul class="menu" id="menu-to-edit"></ul>
- <?php } ?>
+ <?php } ?>
<?php endif; ?>
<?php if ( $add_new_screen ) : ?>
<p class="post-body-plain" id="menu-name-desc"><?php _e( 'Give your menu a name, then click Create Menu.' ); ?></p>
<?php if ( isset( $_GET['use-location'] ) ) : ?>
<input type="hidden" name="use-location" value="<?php echo esc_attr( $_GET['use-location'] ); ?>" />
<?php endif; ?>
- <?php endif; ?>
- <div class="menu-settings" <?php if ( $one_theme_location_no_menus ) { ?>style="display: none;"<?php } ?>>
+ <?php
+ endif;
+
+ $no_menus_style = '';
+ if ( $one_theme_location_no_menus ) {
+ $no_menus_style = 'style="display: none;"';
+ }
+ ?>
+ <div class="menu-settings" <?php echo $no_menus_style; ?>>
<h3><?php _e( 'Menu Settings' ); ?></h3>
<?php
if ( ! isset( $auto_add ) ) {
$auto_add = get_option( 'nav_menu_options' );
- if ( ! isset( $auto_add['auto_add'] ) )
+ if ( ! isset( $auto_add['auto_add'] ) ) {
$auto_add = false;
- elseif ( false !== array_search( $nav_menu_selected_id, $auto_add['auto_add'] ) )
+ } elseif ( false !== array_search( $nav_menu_selected_id, $auto_add['auto_add'] ) ) {
$auto_add = true;
- else
+ } else {
$auto_add = false;
- } ?>
+ }
+ }
+ ?>
<fieldset class="menu-settings-group auto-add-pages">
<legend class="menu-settings-group-name howto"><?php _e( 'Auto add pages' ); ?></legend>
<div class="menu-settings-input checkbox-input">
- <input type="checkbox"<?php checked( $auto_add ); ?> name="auto-add-pages" id="auto-add-pages" value="1" /> <label for="auto-add-pages"><?php printf( __('Automatically add new top-level pages to this menu' ), esc_url( admin_url( 'edit.php?post_type=page' ) ) ); ?></label>
+ <input type="checkbox"<?php checked( $auto_add ); ?> name="auto-add-pages" id="auto-add-pages" value="1" /> <label for="auto-add-pages"><?php printf( __( 'Automatically add new top-level pages to this menu' ), esc_url( admin_url( 'edit.php?post_type=page' ) ) ); ?></label>
</div>
</fieldset>
@@ -817,12 +958,15 @@
<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
- /* translators: %s: menu name */
- printf( _x( '(Currently set to: %s)', 'menu location' ),
+ <span class="theme-location-set">
+ <?php
+ printf(
+ /* translators: %s: menu name */
+ _x( '(Currently set to: %s)', 'menu location' ),
wp_get_nav_menu_object( $menu_locations[ $location ] )->name
);
- ?></span>
+ ?>
+ </span>
<?php endif; ?>
</div>
<?php endforeach; ?>
@@ -837,7 +981,22 @@
<div class="major-publishing-actions wp-clearfix">
<?php if ( 0 != $menu_count && ! $add_new_screen ) : ?>
<span class="delete-action">
- <a class="submitdelete deletion menu-delete" href="<?php echo esc_url( wp_nonce_url( add_query_arg( array( 'action' => 'delete', 'menu' => $nav_menu_selected_id ), admin_url( 'nav-menus.php' ) ), 'delete-nav_menu-' . $nav_menu_selected_id) ); ?>"><?php _e('Delete Menu'); ?></a>
+ <a class="submitdelete deletion menu-delete" href="
+ <?php
+ echo esc_url(
+ wp_nonce_url(
+ add_query_arg(
+ array(
+ 'action' => 'delete',
+ 'menu' => $nav_menu_selected_id,
+ ),
+ admin_url( 'nav-menus.php' )
+ ),
+ 'delete-nav_menu-' . $nav_menu_selected_id
+ )
+ );
+ ?>
+ "><?php _e( 'Delete Menu' ); ?></a>
</span><!-- END .delete-action -->
<?php endif; ?>
<div class="publishing-action">