X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f..03f2fa83c13c1b532284205fa7efcab9b8b2c41f:/wp-admin/nav-menus.php
diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php
index 0dd34cf9..6507f0dc 100644
--- a/wp-admin/nav-menus.php
+++ b/wp-admin/nav-menus.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(
+ '
' . __( 'Cheatin’ uh?' ) . '
' .
+ '' . __( 'You are not allowed to edit theme options on this site.' ) . '
',
+ 403
+ );
+}
wp_enqueue_script( 'nav-menu' );
@@ -67,7 +72,7 @@ switch ( $action ) {
// 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;
@@ -140,7 +145,7 @@ switch ( $action ) {
// 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;
@@ -231,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[] = '' . __('The menu item has been successfully deleted.') . '
';
+ $messages[] = '' . __('The menu item has been successfully deleted.') . '
';
break;
case 'delete':
@@ -248,9 +253,9 @@ switch ( $action ) {
break;
if ( is_wp_error( $deletion ) )
- $messages[] = '' . $deletion->get_error_message() . '
';
+ $messages[] = '' . $deletion->get_error_message() . '
';
else
- $messages[] = '' . __( 'The menu has been successfully deleted.' ) . '
';
+ $messages[] = '' . __( 'The menu has been successfully deleted.' ) . '
';
break;
case 'delete_menus':
@@ -261,13 +266,13 @@ switch ( $action ) {
$deletion = wp_delete_nav_menu( $menu_id_to_delete );
if ( is_wp_error( $deletion ) ) {
- $messages[] = '' . $deletion->get_error_message() . '
';
+ $messages[] = '' . $deletion->get_error_message() . '
';
$deletion_error = true;
}
}
if ( empty( $deletion_error ) )
- $messages[] = '' . __( 'Selected menus have been successfully deleted.' ) . '
';
+ $messages[] = '' . __( 'Selected menus have been successfully deleted.' ) . '
';
break;
case 'update':
@@ -296,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[] = '' . $_nav_menu_selected_id->get_error_message() . '
';
+ $messages[] = '' . $_nav_menu_selected_id->get_error_message() . '
';
} else {
$_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
$nav_menu_selected_id = $_nav_menu_selected_id;
@@ -327,7 +332,7 @@ switch ( $action ) {
exit();
}
} else {
- $messages[] = '' . __( 'Please enter a valid menu name.' ) . '
';
+ $messages[] = '' . __( 'Please enter a valid menu name.' ) . '
';
}
// Update existing menu.
@@ -337,7 +342,7 @@ switch ( $action ) {
$menu_title = trim( esc_html( $_POST['menu-name'] ) );
if ( ! $menu_title ) {
- $messages[] = '' . __( 'Please enter a valid menu name.' ) . '
';
+ $messages[] = '' . __( 'Please enter a valid menu name.' ) . '
';
$menu_title = $_menu_object->name;
}
@@ -345,7 +350,7 @@ 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[] = '' . $_nav_menu_selected_id->get_error_message() . '
';
+ $messages[] = '' . $_nav_menu_selected_id->get_error_message() . '
';
} else {
$_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
$nav_menu_selected_title = $_menu_object->name;
@@ -354,7 +359,13 @@ switch ( $action ) {
// 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;
@@ -374,13 +385,13 @@ switch ( $action ) {
// Set menu locations
set_theme_mod( 'nav_menu_locations', $menu_locations );
- $messages[] = '' . __( 'Menu locations updated.' ) . '
';
+ $messages[] = '' . __( 'Menu locations updated.' ) . '
';
}
break;
}
// Get all nav menus.
-$nav_menus = wp_get_nav_menus( array('orderby' => 'name') );
+$nav_menus = wp_get_nav_menus();
$menu_count = count( $nav_menus );
// Are we on the add new screen?
@@ -454,7 +465,7 @@ if ( ! $nav_menu_selected_title && is_nav_menu( $nav_menu_selected_id ) ) {
}
// Generate truncated menu names.
-foreach( (array) $nav_menus as $key => $_nav_menu ) {
+foreach ( (array) $nav_menus as $key => $_nav_menu ) {
$nav_menus[$key]->truncated_name = wp_html_excerpt( $_nav_menu->name, 40, '…' );
}
@@ -467,6 +478,8 @@ if ( current_theme_supports( 'menus' ) ) {
/*
* 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;
@@ -477,7 +490,14 @@ if ( is_nav_menu( $nav_menu_selected_id ) ) {
$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";
}
@@ -492,7 +512,7 @@ if ( ! current_theme_supports( 'menus' ) && ! $num_locations )
if ( ! $locations_screen ) : // Main tab
$overview = '' . __( 'This screen is used for managing your custom navigation menus.' ) . '
';
- $overview .= '' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a “Custom Menu” widget on the Widgets 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 Fourteen', 'Twenty Thirteen' ) . '
';
+ $overview .= '' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a “Custom Menu” widget on the Widgets 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' ) . '
';
$overview .= '' . __( 'From this screen you can:' ) . '
';
$overview .= '- ' . __( 'Create, edit, and delete menus' ) . '
';
$overview .= '- ' . __( 'Add, organize, and modify individual menu items' ) . '
';
@@ -517,7 +537,7 @@ if ( ! $locations_screen ) : // Main tab
$editing_menus = '' . __( '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.' ) . '
';
$editing_menus .= '' . __( 'Clicking the arrow to the right of any menu item 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.' ) . '
';
$editing_menus .= '- ' . __( 'Add one or several items at once by selecting the checkbox next to each item and clicking Add to Menu' ) . '
';
- $editing_menus .= '- ' . __( 'To add a custom link, expand the Links section, enter a URL and link text, and click Add to Menu' ) .'
';
+ $editing_menus .= '- ' . __( 'To add a custom link, expand the Custom Links section, enter a URL and link text, and click Add to Menu' ) .'
';
$editing_menus .= '- ' . __( 'To reorganize menu items, drag and drop items with your mouse or use your keyboard. Drag or move a menu item a little to the right to make it a submenu' ) . '
';
$editing_menus .= '- ' . __( 'Delete a menu item by expanding it and clicking the Remove link' ) . '
';
@@ -541,7 +561,7 @@ endif;
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Menus') . '
' .
+ '' . __('Documentation on Menus') . '
' .
'' . __('Support Forums') . '
'
);
@@ -549,20 +569,41 @@ get_current_screen()->set_help_sidebar(
require_once( ABSPATH . 'wp-admin/admin-header.php' );
?>
+
+ 'menu_locations' ) : array( 'panel' => 'nav_menus' );
+ printf(
+ ' %2$s',
+ esc_url( add_query_arg( array(
+ array( 'autofocus' => $focus ),
+ 'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
+ ), admin_url( 'customize.php' ) ) ),
+ __( 'Manage in Customizer' )
+ );
+ endif;
+ ?>
+
-
+
' . sprintf( _n( 'Your theme supports %s menu. Select which menu you would like to use.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '';
+ if ( 1 == $num_locations ) {
+ echo '
' . __( 'Your theme supports one menu. Select which menu you would like to use.' ) . '
';
+ } else {
+ echo '
' . 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 ) ) . '
';
+ }
?>