<!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>[13362] trunk: Return menu object from wp_create_nav_menu().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13362">13362</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-24 06:41:35 +0000 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Return menu object from wp_create_nav_menu(). Fix trailing separator in menu list. Disable menu delete because it deletes the current menu when a new menu is added. 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>
<li><a href="#trunkwpincludescustomnavigationphp">trunk/wp-includes/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 (13361 => 13362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-navigation.php 2010-02-24 06:18:13 UTC (rev 13361)
+++ trunk/wp-admin/custom-navigation.php 2010-02-24 06:41:35 UTC (rev 13362)
</span><span class="lines">@@ -54,8 +54,9 @@
</span><span class="cx"> $menu_selected_id = 0;
</span><span class="cx"> $updated = true;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> // Default Menu to show
</span><del>-$custom_menus = get_terms( 'nav_menu', array( 'hide_empty' => false ) );
</del><ins>+$custom_menus = wp_get_nav_menus();
</ins><span class="cx"> if ( ! $menu_selected_id && ! empty( $custom_menus ) )
</span><span class="cx"> $menu_selected_id = $custom_menus[0]->term_id;
</span><span class="cx">
</span><span class="lines">@@ -174,18 +175,19 @@
</span><span class="cx"> <div id="no-js"><h3><?php _e('You do not have JavaScript enabled in your browser. Please enable it to access the Menus functionality.'); ?></h3></div>
</span><span class="cx"> <div id="pages-left">
</span><span class="cx"> <ul class="subsubsub">
</span><del>-<?php if ( ! empty( $custom_menus ) ) {
</del><ins>+<?php if ( ! empty( $custom_menus ) ) {
</ins><span class="cx"> foreach ( $custom_menus as $menu ) {
</span><del>- $menu_term = get_term( $menu, 'nav_menu' );
</del><ins>+ $sep = end($custom_menus) == $menu ? '' : ' | ';
+ // $menu_term = get_term( $menu, 'nav_menu' );
</ins><span class="cx"> if ( ( $menu_id_in_edit == $menu->term_id ) || ( $menu_selected_id == $menu->term_id ) ) { ?>
</span><del>- <li><?php echo esc_html( $menu_term->name ); ?> |</li>
-<?php } else { ?>
- <li><a href='custom-navigation.php?edit_menu=<?php echo esc_attr($menu_term->term_id); ?>'><?php echo esc_html( $menu_term->name ); ?></a> |</li>
-<?php }
</del><ins>+ <li><?php echo esc_html( $menu->name ) . $sep; ?></li>
+<?php } else { ?>
+ <li><a href='custom-navigation.php?edit_menu=<?php echo esc_attr($menu->term_id); ?>'><?php echo esc_html( $menu->name ); ?></a><?php echo $sep; ?></li>
+<?php }
</ins><span class="cx"> }
</span><span class="cx"> } else { ?>
</span><span class="cx"> <li><?php _e( 'Default' ); ?></li>
</span><del>-<?php } ?>
</del><ins>+<?php } ?>
</ins><span class="cx"> </ul>
</span><span class="cx"> <div class="clear"></div>
</span><span class="cx"> <div class="inside">
</span><span class="lines">@@ -233,8 +235,7 @@
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> updatepostdata();
</span><span class="cx"> </script>
</span><del>-
- <input id="delete_menu" name="delete_menu" type="submit" value="<?php esc_attr_e('Delete This Menu'); ?>" />
</del><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>
<a id="trunkwpincludescustomnavigationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/custom-navigation.php (13361 => 13362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/custom-navigation.php 2010-02-24 06:18:13 UTC (rev 13361)
+++ trunk/wp-includes/custom-navigation.php 2010-02-24 06:41:35 UTC (rev 13362)
</span><span class="lines">@@ -46,7 +46,11 @@
</span><span class="cx"> if ( $menu_exists )
</span><span class="cx"> return WP_Error('menu_exists', sprintf( __('A menu named "%s" already exists; please try another name.'), $menu_exists->name ));
</span><span class="cx">
</span><del>- return wp_insert_term( $menu_name, 'nav_menu' );
</del><ins>+ $menu = wp_insert_term( $menu_name, 'nav_menu' );
+ if ( is_wp_error($menu) )
+ return $menu;
+
+ return get_term( $menu['term_id'], 'nav_menu');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function wp_get_nav_menu( $menu ) {
</span></span></pre>
</div>
</div>
</body>
</html>