<!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>[14758] trunk/wp-admin/nav-menus.php:
Make the next available tab active after deleting a tab.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14758">14758</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-05-20 16:57:48 +0000 (Thu, 20 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make the next available tab active after deleting a tab. Props koopersmith. fixes <a href="http://trac.wordpress.org/ticket/13338">#13338</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (14757 => 14758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2010-05-20 14:56:20 UTC (rev 14757)
+++ trunk/wp-admin/nav-menus.php 2010-05-20 16:57:48 UTC (rev 14758)
</span><span class="lines">@@ -241,16 +241,29 @@
</span><span class="cx"> check_admin_referer( 'delete-nav_menu-' . $nav_menu_selected_id );
</span><span class="cx">
</span><span class="cx"> if ( is_nav_menu( $nav_menu_selected_id ) ) {
</span><ins>+ $deleted_nav_menu = wp_get_nav_menu_object( $nav_menu_selected_id );
</ins><span class="cx"> $delete_nav_menu = wp_delete_nav_menu( $nav_menu_selected_id );
</span><span class="cx">
</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><span class="cx"> $messages[] = '<div id="message" class="updated"><p>' . __('The menu has been successfully deleted.') . '</p></div>';
</span><del>- $nav_menu_selected_id = 0; // Reset the selected menu
- unset($_REQUEST['menu']);
</del><ins>+ // Select the next available menu
+ $nav_menu_selected_id = 0;
+ $_nav_menus = wp_get_nav_menus( array('orderby' => 'name') );
+ foreach( $_nav_menus as $index => $_nav_menu ) {
+ if ( strcmp( $_nav_menu->name, $deleted_nav_menu->name ) >= 0
+ || $index == count( $_nav_menus ) - 1 ) {
+ $nav_menu_selected_id = $_nav_menu->term_id;
+ break;
+ }
+ }
</ins><span class="cx"> }
</span><del>- unset( $delete_nav_menu );
</del><ins>+ unset( $delete_nav_menu, $deleted_nav_menu, $_nav_menus );
+ } else {
+ // Reset the selected menu
+ $nav_menu_selected_id = 0;
+ unset( $_REQUEST['menu'] );
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>