<!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>[27150] trunk: Nav Menu: Remove post/page items from the Nav Menu when the post/page is deleted.</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/27150">27150</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2014-02-09 21:36:15 +0000 (Sun, 09 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Nav Menu: Remove post/page items from the Nav Menu when the post/page is deleted.
This was broken through a change in <a href="http://core.trac.wordpress.org/changeset/25163">[25163]</a>. `_menu_item_object` in wp_get_associated_nav_menu_items() is not relevant for post types.
Adds unit tests.
props UmeshSingla for initial patch.
fixes <a href="http://core.trac.wordpress.org/ticket/26795">#26795</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 (27149 => 27150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/nav-menu.php 2014-02-09 21:07:01 UTC (rev 27149)
+++ trunk/src/wp-includes/nav-menu.php 2014-02-09 21:36:15 UTC (rev 27150)
</span><span class="lines">@@ -702,11 +702,19 @@
</span><span class="cx"> );
</span><span class="cx"> foreach( (array) $menu_items as $menu_item ) {
</span><span class="cx"> if ( isset( $menu_item->ID ) && is_nav_menu_item( $menu_item->ID ) ) {
</span><del>- if ( get_post_meta( $menu_item->ID, '_menu_item_type', true ) !== $object_type ||
- get_post_meta( $menu_item->ID, '_menu_item_object', true ) !== $taxonomy )
- continue;
-
- $menu_item_ids[] = (int) $menu_item->ID;
</del><ins>+ $menu_item_type = get_post_meta( $menu_item->ID, '_menu_item_type', true );
+ if (
+ 'post_type' == $object_type &&
+ 'post_type' == $menu_item_type
+ ) {
+ $menu_item_ids[] = (int) $menu_item->ID;
+ } else if (
+ 'taxonomy' == $object_type &&
+ 'taxonomy' == $menu_item_type &&
+ get_post_meta( $menu_item->ID, '_menu_item_object', true ) == $taxonomy
+ ) {
+ $menu_item_ids[] = (int) $menu_item->ID;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsphpunittestspostnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/post/nav-menu.php (27149 => 27150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/post/nav-menu.php 2014-02-09 21:07:01 UTC (rev 27149)
+++ trunk/tests/phpunit/tests/post/nav-menu.php 2014-02-09 21:36:15 UTC (rev 27150)
</span><span class="lines">@@ -18,6 +18,9 @@
</span><span class="cx"> function test_wp_get_associated_nav_menu_items() {
</span><span class="cx"> $tag_id = $this->factory->tag->create();
</span><span class="cx"> $cat_id = $this->factory->category->create();
</span><ins>+ $post_id = $this->factory->post->create();
+ $post_2_id = $this->factory->post->create();
+ $page_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
</ins><span class="cx">
</span><span class="cx"> $tag_insert = wp_update_nav_menu_item( $this->menu_id, 0, array(
</span><span class="cx"> 'menu-item-type' => 'taxonomy',
</span><span class="lines">@@ -33,9 +36,56 @@
</span><span class="cx"> 'menu-item-status' => 'publish'
</span><span class="cx"> ) );
</span><span class="cx">
</span><ins>+ $post_insert = wp_update_nav_menu_item( $this->menu_id, 0, array(
+ 'menu-item-type' => 'post_type',
+ 'menu-item-object' => 'post',
+ 'menu-item-object-id' => $post_id,
+ 'menu-item-status' => 'publish'
+ ) );
+
+ // Item without menu-item-object arg
+ $post_2_insert = wp_update_nav_menu_item( $this->menu_id, 0, array(
+ 'menu-item-type' => 'post_type',
+ 'menu-item-object-id' => $post_2_id,
+ 'menu-item-status' => 'publish'
+ ) );
+
+ $page_insert = wp_update_nav_menu_item( $this->menu_id, 0, array(
+ 'menu-item-type' => 'post_type',
+ 'menu-item-object' => 'page',
+ 'menu-item-object-id' => $page_id,
+ 'menu-item-status' => 'publish'
+ ) );
+
</ins><span class="cx"> $tag_items = wp_get_associated_nav_menu_items( $tag_id, 'taxonomy', 'post_tag' );
</span><span class="cx"> $this->assertEqualSets( array( $tag_insert ), $tag_items );
</span><span class="cx"> $cat_items = wp_get_associated_nav_menu_items( $cat_id, 'taxonomy', 'category' );
</span><span class="cx"> $this->assertEqualSets( array( $cat_insert ), $cat_items );
</span><ins>+ $post_items = wp_get_associated_nav_menu_items( $post_id );
+ $this->assertEqualSets( array( $post_insert ), $post_items );
+ $post_2_items = wp_get_associated_nav_menu_items( $post_2_id );
+ $this->assertEqualSets( array( $post_2_insert ), $post_2_items );
+ $page_items = wp_get_associated_nav_menu_items( $page_id );
+ $this->assertEqualSets( array( $page_insert ), $page_items );
+
+ wp_delete_term( $tag_id, 'post_tag' );
+ $tag_items = wp_get_associated_nav_menu_items( $tag_id, 'taxonomy', 'post_tag' );
+ $this->assertEqualSets( array(), $tag_items );
+
+ wp_delete_term( $cat_id, 'category' );
+ $cat_items = wp_get_associated_nav_menu_items( $cat_id, 'taxonomy', 'category' );
+ $this->assertEqualSets( array(), $cat_items );
+
+ wp_delete_post( $post_id, true );
+ $post_items = wp_get_associated_nav_menu_items( $post_id );
+ $this->assertEqualSets( array(), $post_items );
+
+ wp_delete_post( $post_2_id, true );
+ $post_2_items = wp_get_associated_nav_menu_items( $post_2_id );
+ $this->assertEqualSets( array(), $post_2_items );
+
+ wp_delete_post( $page_id, true );
+ $page_items = wp_get_associated_nav_menu_items( $page_id );
+ $this->assertEqualSets( array(), $page_items );
</ins><span class="cx"> }
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre>
</div>
</div>
</body>
</html>