<!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" />
<title>[27556] trunk: Explicitly assign menu term relationship rather than piggybacking on wp_insert_post() with the tax_input argument.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27556">27556</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-03-15 06:06:41 +0000 (Sat, 15 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Explicitly assign menu term relationship rather than piggybacking on wp_insert_post() with the tax_input argument.
That argument currently depends on user context (see <a href="http://core.trac.wordpress.org/ticket/19373">#19373</a>).
Adds unit test for properly updating orphaned menu items.
props danielbachhuber.
fixes <a href="http://core.trac.wordpress.org/ticket/27113">#27113</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
<li><a href="#trunktestsphpunittestspostnavmenuphp">trunk/tests/phpunit/tests/post/nav-menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/nav-menu.php (27555 => 27556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/nav-menu.php 2014-03-15 05:13:23 UTC (rev 27555)
+++ trunk/src/wp-includes/nav-menu.php 2014-03-15 06:06:41 UTC (rev 27556)
</span><span class="lines">@@ -365,10 +365,6 @@
</span><span class="cx">
</span><span class="cx"> $update = 0 != $menu_item_db_id;
</span><span class="cx">
</span><del>- // Only set the menu term if it isn't set to avoid unnecessary wp_get_object_terms()
- if ( $menu_id && ( ! $update || ! is_object_in_term( $menu_item_db_id, 'nav_menu', (int) $menu->term_id ) ) )
- $post['tax_input'] = array( 'nav_menu' => array( intval( $menu->term_id ) ) );
-
</del><span class="cx"> // New menu item. Default is draft status
</span><span class="cx"> if ( ! $update ) {
</span><span class="cx"> $post['ID'] = 0;
</span><span class="lines">@@ -378,6 +374,12 @@
</span><span class="cx"> return $menu_item_db_id;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Associate the menu item with the menu term
+ // Only set the menu term if it isn't set to avoid unnecessary wp_get_object_terms()
+ if ( $menu_id && ( ! $update || ! is_object_in_term( $menu_item_db_id, 'nav_menu', (int) $menu->term_id ) ) ) {
+ wp_set_object_terms( $menu_item_db_id, array( $menu->term_id ), 'nav_menu' );
+ }
+
</ins><span class="cx"> if ( 'custom' == $args['menu-item-type'] ) {
</span><span class="cx"> $args['menu-item-object-id'] = $menu_item_db_id;
</span><span class="cx"> $args['menu-item-object'] = 'custom';
</span></span></pre></div>
<a id="trunktestsphpunittestspostnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/post/nav-menu.php (27555 => 27556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/post/nav-menu.php 2014-03-15 05:13:23 UTC (rev 27555)
+++ trunk/tests/phpunit/tests/post/nav-menu.php 2014-03-15 06:06:41 UTC (rev 27556)
</span><span class="lines">@@ -88,4 +88,32 @@
</span><span class="cx"> $page_items = wp_get_associated_nav_menu_items( $page_id );
</span><span class="cx"> $this->assertEqualSets( array(), $page_items );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @ticket 27113
+ */
+ function test_orphan_nav_menu_item() {
+
+ // Create an orphan nav menu item
+ $custom_item_id = wp_update_nav_menu_item( 0, 0, array(
+ 'menu-item-type' => 'custom',
+ 'menu-item-title' => 'Wordpress.org',
+ 'menu-item-link' => 'http://wordpress.org',
+ 'menu-item-status' => 'publish'
+ ) );
+
+ // Confirm it saved properly
+ $custom_item = wp_setup_nav_menu_item( get_post( $custom_item_id ) );
+ $this->assertEquals( 'Wordpress.org', $custom_item->title );
+
+ // Update the orphan with an associated nav menu
+ wp_update_nav_menu_item( $this->menu_id, $custom_item_id, array(
+ 'menu-item-title' => 'WordPress.org',
+ ) );
+ $menu_items = wp_get_nav_menu_items( $this->menu_id );
+ $custom_item = wp_filter_object_list( $menu_items, array( 'db_id' => $custom_item_id ) );
+ $custom_item = array_pop( $custom_item );
+ $this->assertEquals( 'WordPress.org', $custom_item->title );
+
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>