<!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>[15104] trunk/wp-includes/nav-menu.php: Nav menu API cleanups.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15104">15104</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-06-02 13:43:46 +0000 (Wed, 02 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Nav menu API cleanups. Props filosofo. fixes <a href="http://trac.wordpress.org/ticket/13696">#13696</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesnavmenuphp">trunk/wp-includes/nav-menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu.php (15103 => 15104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php 2010-06-02 05:54:14 UTC (rev 15103)
+++ trunk/wp-includes/nav-menu.php 2010-06-02 13:43:46 UTC (rev 15104)
</span><span class="lines">@@ -146,22 +146,7 @@
</span><span class="cx"> * @return mixed Menu object on success|WP_Error on failure
</span><span class="cx"> */
</span><span class="cx"> function wp_create_nav_menu( $menu_name ) {
</span><del>- $menu_exists = get_term_by( 'name', $menu_name, 'nav_menu' );
-
- if ( $menu_exists )
- return new WP_Error( 'menu_exists', sprintf( __('The menu name <strong>%s</strong> conflicts with another menu name. Please try another.'), esc_html( $menu_name ) ) );
-
- $menu = wp_insert_term( $menu_name, 'nav_menu' );
-
- if ( is_wp_error($menu) )
- return $menu;
-
- $result = get_term( $menu['term_id'], 'nav_menu' );
-
- if ( $result && !is_wp_error($result) )
- do_action( 'wp_create_nav_menu', $menu['term_id'] );
-
- return $result;
</del><ins>+ return wp_update_nav_menu_object( 0, array( 'menu-name' => $menu_name ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -197,7 +182,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><del>- * @param int $menu_id The ID of the menu
</del><ins>+ * @param int $menu_id The ID of the menu or "0" to create a new menu.
</ins><span class="cx"> * @param array $menu_data The array of menu data.
</span><span class="cx"> * @return int|error object The menu's ID or WP_Error object.
</span><span class="cx"> */
</span><span class="lines">@@ -206,16 +191,6 @@
</span><span class="cx">
</span><span class="cx"> $_menu = wp_get_nav_menu_object( $menu_id );
</span><span class="cx">
</span><del>- // menu doesn't already exist
- if ( ! $_menu || is_wp_error( $_menu ) )
- $_menu = wp_create_nav_menu( $menu_data['menu-name'] );
-
- if ( is_wp_error( $_menu ) )
- return $_menu;
-
- if ( ! $_menu || ! isset( $_menu->term_id ) )
- return 0;
-
</del><span class="cx"> $args = array(
</span><span class="cx"> 'description' => ( isset( $menu_data['description'] ) ? $menu_data['description'] : '' ),
</span><span class="cx"> 'name' => ( isset( $menu_data['menu-name'] ) ? $menu_data['menu-name'] : '' ),
</span><span class="lines">@@ -223,9 +198,7 @@
</span><span class="cx"> 'slug' => null,
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $menu_id = (int) $_menu->term_id;
-
- // double-check that we're not changing a menu to the name of another
</del><ins>+ // double-check that we're not going to have one menu take the name of another
</ins><span class="cx"> $_possible_existing = get_term_by( 'name', $menu_data['menu-name'], 'nav_menu' );
</span><span class="cx"> if (
</span><span class="cx"> $_possible_existing &&
</span><span class="lines">@@ -235,12 +208,35 @@
</span><span class="cx"> )
</span><span class="cx"> return new WP_Error( 'menu_exists', sprintf( __('The menu name <strong>%s</strong> conflicts with another menu name. Please try another.'), esc_html( $menu_data['menu-name'] ) ) );
</span><span class="cx">
</span><ins>+ // menu doesn't already exist, so create a new menu
+ if ( ! $_menu || is_wp_error( $_menu ) ) {
+ $menu_exists = get_term_by( 'name', $menu_data['menu-name'], 'nav_menu' );
+
+ if ( $menu_exists )
+ return new WP_Error( 'menu_exists', sprintf( __('The menu name <strong>%s</strong> conflicts with another menu name. Please try another.'), esc_html( $menu_data['menu-name'] ) ) );
+
+ $_menu = wp_insert_term( $menu_data['menu-name'], 'nav_menu', $args );
+
+ if ( is_wp_error( $_menu ) )
+ return $_menu;
+
+ do_action( 'wp_create_nav_menu', $_menu['term_id'], $menu_data );
+
+ return (int) $_menu['term_id'];
+ }
+
+ if ( ! $_menu || ! isset( $_menu->term_id ) )
+ return 0;
+
+ $menu_id = (int) $_menu->term_id;
+
</ins><span class="cx"> $update_response = wp_update_term( $menu_id, 'nav_menu', $args );
</span><span class="cx">
</span><del>- if ( ! is_wp_error( $update_response ) )
- return $menu_id;
- else
</del><ins>+ if ( is_wp_error( $update_response ) )
</ins><span class="cx"> return $update_response;
</span><ins>+
+ do_action( 'wp_update_nav_menu', $menu_id, $menu_data );
+ return $menu_id;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>