<!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>[36080] trunk: Taxonomy: Pass object ids to delete_* actions.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/36080">36080</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/36080","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-12-23 23:43:03 +0000 (Wed, 23 Dec 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Taxonomy: Pass object ids to delete_* actions.
Allows for more targeted updates to affected posts in callbacks.
Disambiguates `$objects` variable and amends unit tests.
Fixes <a href="https://core.trac.wordpress.org/ticket/35213">#35213</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststermwpDeleteTermphp">trunk/tests/phpunit/tests/term/wpDeleteTerm.php</a></li>
<li><a href="#trunktestsphpunitteststermwpInsertTermphp">trunk/tests/phpunit/tests/term/wpInsertTerm.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2015-12-23 20:14:12 UTC (rev 36079)
+++ trunk/src/wp-includes/taxonomy.php 2015-12-23 23:43:03 UTC (rev 36080)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2158,10 +2158,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Get the term before deleting it or its term relationships so we can pass to actions below.
</span><span class="cx" style="display: block; padding: 0 10px"> $deleted_term = get_term( $term, $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $objects = $wpdb->get_col( $wpdb->prepare( "SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tt_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $object_ids = (array) $wpdb->get_col( $wpdb->prepare( "SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tt_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( (array) $objects as $object ) {
- $terms = wp_get_object_terms($object, $taxonomy, array('fields' => 'ids', 'orderby' => 'none'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $object_ids as $object_id ) {
+ $terms = wp_get_object_terms( $object_id, $taxonomy, array( 'fields' => 'ids', 'orderby' => 'none' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == count($terms) && isset($default) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = array($default);
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2170,13 +2170,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = array_merge($terms, array($default));
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = array_map('intval', $terms);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_object_terms($object, $terms, $taxonomy);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_object_terms( $object_id, $terms, $taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clean the relationship caches for all object types using this term.
</span><span class="cx" style="display: block; padding: 0 10px"> $tax_object = get_taxonomy( $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $tax_object->object_type as $object_type )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- clean_object_term_cache( $objects, $object_type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ clean_object_term_cache( $object_ids, $object_type );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->termmeta WHERE term_id = %d ", $term ) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $term_meta_ids as $mid ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2212,14 +2212,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after a term is deleted from the database and the cache is cleaned.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.5.0 Introduced `$object_ids` argument.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $term Term ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $tt_id Term taxonomy ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy Taxonomy slug.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $deleted_term Copy of the already-deleted term, in the form specified
</span><span class="cx" style="display: block; padding: 0 10px"> * by the parent function. WP_Error otherwise.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $object_ids List of term object IDs.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'delete_term', $term, $tt_id, $taxonomy, $deleted_term );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'delete_term', $term, $tt_id, $taxonomy, $deleted_term, $object_ids );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after a term in a specific taxonomy is deleted.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2228,13 +2230,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * taxonomy the term belonged to.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.5.0 Introduced `$object_ids` argument.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $term Term ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $tt_id Term taxonomy ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $deleted_term Copy of the already-deleted term, in the form specified
</span><span class="cx" style="display: block; padding: 0 10px"> * by the parent function. WP_Error otherwise.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $object_ids List of term object IDs.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( "delete_$taxonomy", $term, $tt_id, $deleted_term );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( "delete_$taxonomy", $term, $tt_id, $deleted_term, $object_ids );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpDeleteTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/wpDeleteTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpDeleteTerm.php 2015-12-23 20:14:12 UTC (rev 36079)
+++ trunk/tests/phpunit/tests/term/wpDeleteTerm.php 2015-12-23 23:43:03 UTC (rev 36080)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,9 +5,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Term_WpDeleteTerm extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> protected $deleted_term;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $object_ids;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33485
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 35213
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_count_property_passed_to_filters_should_reflect_pre_deleted_term() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,20 +18,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = self::factory()->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::factory()->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_object_terms( $p, array( $terms[0] ), 'wptests_tax' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_object_terms( $post_id, array( $terms[0] ), 'wptests_tax' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'delete_term', array( $this, 'catch_deleted_term' ), 10, 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'delete_term', array( $this, 'catch_deleted_term' ), 10, 5 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_term( $terms[0], 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $this->deleted_term->count );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $this->object_ids, array( "$post_id" ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_term( $terms[1], 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $this->deleted_term->count );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $this->object_ids, array() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function catch_deleted_term( $term_id, $tt_id, $taxonomy, $deleted_term ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function catch_deleted_term( $term_id, $tt_id, $taxonomy, $deleted_term, $object_ids ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->deleted_term = $deleted_term;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->object_ids = $object_ids;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpInsertTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/wpInsertTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpInsertTerm.php 2015-12-23 20:14:12 UTC (rev 36079)
+++ trunk/tests/phpunit/tests/term/wpInsertTerm.php 2015-12-23 23:43:03 UTC (rev 36080)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,9 +37,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( term_exists($t['term_id']) > 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // now delete it
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'delete_term', array( $this, 'deleted_term_cb' ), 10, 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'delete_term', array( $this, 'deleted_term_cb' ), 10, 5 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_delete_term( $t['term_id'], $taxonomy ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'delete_term', array( $this, 'deleted_term_cb' ), 10, 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'delete_term', array( $this, 'deleted_term_cb' ), 10, 5 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( term_exists($term) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( term_exists($t['term_id']) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $initial_count, wp_count_terms( $taxonomy ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -644,13 +644,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** Helpers **********************************************************/
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function deleted_term_cb( $term, $tt_id, $taxonomy, $deleted_term ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function deleted_term_cb( $term, $tt_id, $taxonomy, $deleted_term, $object_ids ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'object', $deleted_term );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'int', $term );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertInternalType( 'array', $object_ids );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Pesky string $this->assertInternalType( 'int', $tt_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $term, $deleted_term->term_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $taxonomy, $deleted_term->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $tt_id, $deleted_term->term_taxonomy_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEmpty( $object_ids );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function _pre_insert_term_callback() {
</span></span></pre>
</div>
</div>
</body>
</html>