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

Use get_nav_menu_locations() in wp_delete_nav_menu(). 

props nofearinc.
see #25064.

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


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

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

Binary file not shown.

4
wp-includes/nav-menu.php
View File

@ -190,8 +190,8 @@ function wp_delete_nav_menu( $menu ) {
$result = wp_delete_term( $menu->term_id, 'nav_menu' ); $result = wp_delete_term( $menu->term_id, 'nav_menu' );
// Remove this menu from any locations. // Remove this menu from any locations.
$locations = get_theme_mod( 'nav_menu_locations' ); $locations = get_nav_menu_locations();
foreach ( (array) $locations as $location => $menu_id ) { foreach ( $locations as $location => $menu_id ) {
if ( $menu_id == $menu->term_id ) if ( $menu_id == $menu->term_id )
$locations[ $location ] = 0; $locations[ $location ] = 0;
} }