From 0d9fcbd8412279a83ae953bbcbe5363c4d1b879e Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Sat, 31 Aug 2013 01:39:09 +0000
Subject: [PATCH] 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
---
 wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 115501 -> 115501 bytes
 wp-includes/nav-menu.php                |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz
index 8cbfef5173e6df4a0c51e28a9f23cc04af664b7f..642db8713711dbbd95070bb83adab2da82f5eaea 100644
GIT binary patch
delta 29
lcmZ46#=f?VeL@yXZ0+aV#=Nb0jN1=!T%NUp+dqhv0RX_A3<m%J

delta 29
lcmZ46#=f?VeL@zCZ|!H_#=Nb0jN1=!Bq+ar?;pg<006vd3={wW

diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php
index eab50c9098..6330af2604 100644
--- a/wp-includes/nav-menu.php
+++ b/wp-includes/nav-menu.php
@@ -190,8 +190,8 @@ function wp_delete_nav_menu( $menu ) {
 	$result = wp_delete_term( $menu->term_id, 'nav_menu' );
 
 	// Remove this menu from any 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 ) {
 		if ( $menu_id == $menu->term_id )
 			$locations[ $location ] = 0;
 	}