<!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>[25163] trunk: Pass the taxonomy around to relevant nav menu actions to avoid arbitrarily deleting all items with `menu-item-type` of `taxonomy`.</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/25163">25163</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-08-29 16:44:36 +0000 (Thu, 29 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pass the taxonomy around to relevant nav menu actions to avoid arbitrarily deleting all items with `menu-item-type` of `taxonomy`. Adds unit test for `wp_get_associated_nav_menu_items()`.
Props garyc40, SergeyBiryukov.
Fixes <a href="http://core.trac.wordpress.org/ticket/15264">#15264</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkteststestspostnavmenuphp">trunk/tests/tests/post/nav-menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/default-filters.php (25162 => 25163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/default-filters.php 2013-08-29 16:23:30 UTC (rev 25162)
+++ trunk/src/wp-includes/default-filters.php 2013-08-29 16:44:36 UTC (rev 25163)
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx">
</span><span class="cx"> // Navigation menu actions
</span><span class="cx"> add_action( 'delete_post', '_wp_delete_post_menu_item' );
</span><del>-add_action( 'delete_term', '_wp_delete_tax_menu_item' );
</del><ins>+add_action( 'delete_term', '_wp_delete_tax_menu_item', 10, 3 );
</ins><span class="cx"> add_action( 'transition_post_status', '_wp_auto_add_pages_to_menu', 10, 3 );
</span><span class="cx">
</span><span class="cx"> // Post Thumbnail CSS class filtering
</span></span></pre></div>
<a id="trunksrcwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/nav-menu.php (25162 => 25163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/nav-menu.php 2013-08-29 16:23:30 UTC (rev 25162)
+++ trunk/src/wp-includes/nav-menu.php 2013-08-29 16:44:36 UTC (rev 25163)
</span><span class="lines">@@ -685,9 +685,10 @@
</span><span class="cx"> *
</span><span class="cx"> * @param int $object_id The ID of the original object.
</span><span class="cx"> * @param string $object_type The type of object, such as "taxonomy" or "post_type."
</span><ins>+ * @param string $taxonomy If $object_type is "taxonomy", $taxonomy is the name of the tax that $object_id belongs to
</ins><span class="cx"> * @return array The array of menu item IDs; empty array if none;
</span><span class="cx"> */
</span><del>-function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_type' ) {
</del><ins>+function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_type', $taxonomy = '' ) {
</ins><span class="cx"> $object_id = (int) $object_id;
</span><span class="cx"> $menu_item_ids = array();
</span><span class="cx">
</span><span class="lines">@@ -703,7 +704,8 @@
</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 )
</del><ins>+ if ( get_post_meta( $menu_item->ID, '_menu_item_type', true ) !== $object_type ||
+ get_post_meta( $menu_item->ID, '_menu_item_object', true ) !== $taxonomy )
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> $menu_item_ids[] = (int) $menu_item->ID;
</span><span class="lines">@@ -741,10 +743,10 @@
</span><span class="cx"> * @param int $object_id The ID of the original object being trashed.
</span><span class="cx"> *
</span><span class="cx"> */
</span><del>-function _wp_delete_tax_menu_item( $object_id = 0 ) {
</del><ins>+function _wp_delete_tax_menu_item( $object_id = 0, $tt_id, $taxonomy ) {
</ins><span class="cx"> $object_id = (int) $object_id;
</span><span class="cx">
</span><del>- $menu_item_ids = wp_get_associated_nav_menu_items( $object_id, 'taxonomy' );
</del><ins>+ $menu_item_ids = wp_get_associated_nav_menu_items( $object_id, 'taxonomy', $taxonomy );
</ins><span class="cx">
</span><span class="cx"> foreach( (array) $menu_item_ids as $menu_item_id ) {
</span><span class="cx"> wp_delete_post( $menu_item_id, true );
</span></span></pre></div>
<a id="trunkteststestspostnavmenuphp"></a>
<div class="addfile"><h4>Added: trunk/tests/tests/post/nav-menu.php (0 => 25163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/tests/post/nav-menu.php (rev 0)
+++ trunk/tests/tests/post/nav-menu.php 2013-08-29 16:44:36 UTC (rev 25163)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+<?php
+/**
+ * @group post
+ * @group navmenus
+ */
+class Test_Nav_Menus extends WP_UnitTestCase {
+ /**
+ * @var int
+ */
+ public $menu_id;
+
+ function setUp() {
+ parent::setUp();
+
+ $this->menu_id = wp_create_nav_menu( rand_str() );
+ }
+
+ function test_wp_get_associated_nav_menu_items() {
+ $tag_id = $this->factory->tag->create();
+ $cat_id = $this->factory->category->create();
+
+ $tag_insert = wp_update_nav_menu_item( $this->menu_id, 0, array(
+ 'menu-item-type' => 'taxonomy',
+ 'menu-item-object' => 'post_tag',
+ 'menu-item-object-id' => $tag_id,
+ 'menu-item-status' => 'publish'
+ ) );
+
+ $cat_insert = wp_update_nav_menu_item( $this->menu_id, 0, array(
+ 'menu-item-type' => 'taxonomy',
+ 'menu-item-object' => 'category',
+ 'menu-item-object-id' => $cat_id,
+ 'menu-item-status' => 'publish'
+ ) );
+
+ $tag_items = wp_get_associated_nav_menu_items( $tag_id, 'taxonomy', 'post_tag' );
+ $this->assertEqualSets( array( $tag_insert ), $tag_items );
+ $cat_items = wp_get_associated_nav_menu_items( $cat_id, 'taxonomy', 'category' );
+ $this->assertEqualSets( array( $cat_insert ), $cat_items );
+ }
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>