WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Nav menus: Allow assigning a new menu to an existing location when no theme setting is currently saved. 

props ocean90.
see #25064, for trunk.

Built from https://develop.svn.wordpress.org/trunk@25195


git-svn-id: http://core.svn.wordpress.org/trunk@25167 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-08-31 01:37:08 +00:00
parent 1ef62770d2
commit 8e56222a1a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-admin/nav-menus.php
View File

@ -300,18 +300,19 @@ switch ( $action ) {
// If there are menu items, add them
wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title );
// Auto-save nav_menu_locations
$locations = get_theme_mod( 'nav_menu_locations' );
foreach ( (array) $locations as $location => $menu_id ) {
$locations = get_nav_menu_locations();
foreach ( $locations as $location => $menu_id ) {
$locations[ $location ] = $nav_menu_selected_id;
break; // There should only be 1
}
set_theme_mod( 'nav_menu_locations', $locations );
}
if ( isset( $_REQUEST['use-location'] ) ) {
$locations = get_theme_mod( 'nav_menu_locations' );
if ( isset( $locations[$_REQUEST['use-location']] ) )
$locations[$_REQUEST['use-location']] = $nav_menu_selected_id;
set_theme_mod( 'nav_menu_locations', $locations );
$locations = get_registered_nav_menus();
$menu_locations = get_nav_menu_locations();
if ( isset( $locations[ $_REQUEST['use-location'] ] ) )
$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 ) );

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.