<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15100] trunk/wp-admin: Clear nav menu from menu locations on delete.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15100">15100</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-06-02 05:10:31 +0000 (Wed, 02 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clear nav menu from menu locations on delete. Additional sanity checks. fixes <a href="http://trac.wordpress.org/ticket/13690">#13690</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (15099 => 15100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php 2010-06-01 21:57:26 UTC (rev 15099)
+++ trunk/wp-admin/includes/nav-menu.php 2010-06-02 05:10:31 UTC (rev 15100)
</span><span class="lines">@@ -473,7 +473,7 @@
</span><span class="cx"> <label class="howto" for="locations-<?php echo $location; ?>">
</span><span class="cx"> <span><?php echo $description; ?></span>
</span><span class="cx"> <select name="menu-locations[<?php echo $location; ?>]" id="locations-<?php echo $location; ?>">
</span><del>- <option value=""></option>
</del><ins>+ <option value="0"></option>
</ins><span class="cx"> <?php foreach ( $menus as $menu ) : ?>
</span><span class="cx"> <option<?php selected( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $menu->term_id ); ?>
</span><span class="cx"> value="<?php echo $menu->term_id; ?>"><?php
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (15099 => 15100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2010-06-01 21:57:26 UTC (rev 15099)
+++ trunk/wp-admin/nav-menus.php 2010-06-02 05:10:31 UTC (rev 15100)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> case 'add-menu-item':
</span><span class="cx"> check_admin_referer( 'add-menu_item', 'menu-settings-column-nonce' );
</span><span class="cx"> if ( isset( $_REQUEST['nav-menu-locations'] ) )
</span><del>- set_theme_mod( 'nav_menu_locations', $_REQUEST['menu-locations'] );
</del><ins>+ set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_REQUEST['menu-locations'] ) );
</ins><span class="cx"> elseif ( isset( $_REQUEST['menu-item'] ) )
</span><span class="cx"> wp_save_nav_menu_items( $nav_menu_selected_id, $_REQUEST['menu-item'] );
</span><span class="cx"> break;
</span><span class="lines">@@ -233,12 +233,8 @@
</span><span class="cx"> check_admin_referer( 'delete-menu_item_' . $menu_item_id );
</span><span class="cx">
</span><span class="cx">
</span><del>- if ( is_nav_menu_item( $menu_item_id ) ) {
- if ( wp_delete_post( $menu_item_id, true ) ) {
-
- $messages[] = '<div id="message" class="updated"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
- }
- }
</del><ins>+ if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) )
+ $messages[] = '<div id="message" class="updated"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
</ins><span class="cx"> break;
</span><span class="cx"> case 'delete':
</span><span class="cx"> check_admin_referer( 'delete-nav_menu-' . $nav_menu_selected_id );
</span><span class="lines">@@ -250,6 +246,13 @@
</span><span class="cx"> if ( is_wp_error($delete_nav_menu) ) {
</span><span class="cx"> $messages[] = '<div id="message" class="error"><p>' . $delete_nav_menu->get_error_message() . '</p></div>';
</span><span class="cx"> } else {
</span><ins>+ // Remove this menu from any locations.
+ $locations = get_theme_mod( 'nav_menu_locations' );
+ foreach ( $locations as $location => $menu_id ) {
+ if ( $menu_id == $nav_menu_selected_id )
+ $locations[ $location ] = 0;
+ }
+ set_theme_mod( 'nav_menu_locations', $locations );
</ins><span class="cx"> $messages[] = '<div id="message" class="updated"><p>' . __('The menu has been successfully deleted.') . '</p></div>';
</span><span class="cx"> // Select the next available menu
</span><span class="cx"> $nav_menu_selected_id = 0;
</span><span class="lines">@@ -275,7 +278,7 @@
</span><span class="cx">
</span><span class="cx"> // Update menu theme locations
</span><span class="cx"> if ( isset( $_POST['menu-locations'] ) )
</span><del>- set_theme_mod( 'nav_menu_locations', $_POST['menu-locations'] );
</del><ins>+ set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_POST['menu-locations'] ) );
</ins><span class="cx">
</span><span class="cx"> // Add Menu
</span><span class="cx"> if ( 0 == $nav_menu_selected_id ) {
</span></span></pre>
</div>
</div>
</body>
</html>