<!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>[13352] trunk/wp-admin/custom-navigation.php:
add menu delete & other custom menu cleanup, See #11817</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13352">13352</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-23 23:53:08 +0000 (Tue, 23 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add menu delete & other custom menu cleanup, See <a href="http://trac.wordpress.org/ticket/11817">#11817</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustomnavigationphp">trunk/wp-admin/custom-navigation.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustomnavigationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-navigation.php (13351 => 13352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-navigation.php 2010-02-23 23:46:07 UTC (rev 13351)
+++ trunk/wp-admin/custom-navigation.php 2010-02-23 23:53:08 UTC (rev 13352)
</span><span class="lines">@@ -37,18 +37,26 @@
</span><span class="cx">
</span><span class="cx"> $messagesdiv = '';
</span><span class="cx"> $menu_id_in_edit = 0;
</span><ins>+$updated = false;
</ins><span class="cx">
</span><span class="cx"> // Check which menu is selected and if menu is in edit already
</span><del>-if ( isset( $_POST['switch_menu'] ) )
</del><ins>+if ( isset( $_POST['switch_menu'] ) ) {
</ins><span class="cx"> $menu_selected_id = (int) $_POST['menu_select'];
</span><del>-elseif ( isset( $_POST['menu_id_in_edit'] ) )
</del><ins>+ $updated = true;
+} elseif ( isset( $_POST['menu_id_in_edit'] ) ) {
</ins><span class="cx"> $menu_selected_id = (int) $_POST['menu_id_in_edit'];
</span><del>-else
</del><ins>+} else {
</ins><span class="cx"> $menu_selected_id = 0;
</span><ins>+}
</ins><span class="cx">
</span><ins>+if ( isset( $_POST[ 'delete_menu' ] ) && $menu_selected_id > 0 ) {
+ wp_delete_nav_menu( $menu_selected_id );
+ $menu_selected_id = 0;
+ $updated = true;
+}
</ins><span class="cx"> // Default Menu to show
</span><span class="cx"> $custom_menus = get_terms( 'nav_menu', array( 'hide_empty' => false ) );
</span><del>-if ( !empty( $custom_menus ) )
</del><ins>+if ( ! $menu_selected_id && ! empty( $custom_menus ) )
</ins><span class="cx"> $menu_selected_id = $custom_menus[0]->term_id;
</span><span class="cx">
</span><span class="cx"> $menu_title = '';
</span><span class="lines">@@ -64,6 +72,7 @@
</span><span class="cx"> if ( isset( $_POST['set_wp_menu'] ) ) {
</span><span class="cx"> // @todo validate set_wp_menu
</span><span class="cx"> update_option( 'wp_custom_nav_menu', $_POST['enable_wp_menu'] );
</span><ins>+ $updated = true;
</ins><span class="cx"> $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . __('Menu has been updated!') . '</p></div>';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -73,7 +82,7 @@
</span><span class="cx"> $postCounter = 0;
</span><span class="cx">
</span><span class="cx"> // Create a new menu. Menus are stored as terms in the 'menu' taxonomy.
</span><del>-if ( isset( $_POST['add_menu'] ) ) {
</del><ins>+if ( isset( $_POST['add_menu'] ) && ! $updated ) {
</ins><span class="cx"> $insert_menu_name = $_POST['add_menu_name'];
</span><span class="cx">
</span><span class="cx"> if ( $insert_menu_name != '' ) {
</span><span class="lines">@@ -90,9 +99,10 @@
</span><span class="cx"> } else {
</span><span class="cx"> $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . __('Please enter a valid menu name.') . '</p></div>';
</span><span class="cx"> }
</span><ins>+ $updated = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-if ( isset($_POST['reset_wp_menu']) ) {
</del><ins>+if ( isset($_POST['reset_wp_menu']) && ! $updated ) {
</ins><span class="cx"> $success = wp_reset_nav_menu();
</span><span class="cx"> if ( $success ) {
</span><span class="cx"> // DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
</span><span class="lines">@@ -104,7 +114,7 @@
</span><span class="cx"> // DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
</span><span class="cx"> $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . __('The menu could not be reset. Please try again.') . '</p></div>';
</span><span class="cx"> }
</span><del>-} elseif ( $postCounter > 0 && $menu_selected_id > 0 ) {
</del><ins>+} elseif ( $postCounter > 0 && $menu_selected_id > 0 && ! $updated ) {
</ins><span class="cx"> $menu_items = wp_get_nav_menu_items( $menu_selected_id, array('orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID') );
</span><span class="cx"> $parent_menu_ids = array();
</span><span class="cx">
</span><span class="lines">@@ -209,6 +219,7 @@
</span><span class="cx"> updatepostdata();
</span><span class="cx"> </script>
</span><span class="cx">
</span><ins>+ <input id="delete_menu" name="delete_menu" type="submit" value="<?php esc_attr_e('Delete This Menu'); ?>" />
</ins><span class="cx"> <input id="save_bottom" name="save_bottom" type="submit" value="<?php esc_attr_e('Save All Changes'); ?>" /></p>
</span><span class="cx"> </div><!-- /.inside -->
</span><span class="cx"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>