<!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>[28951] trunk: Clarify the docs and add more unit tests for wp_set_object_terms().</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/28951">28951</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2014-07-02 01:27:07 +0000 (Wed, 02 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clarify the docs and add more unit tests for wp_set_object_terms().
props DrewAPicture.
fixes <a href="http://core.trac.wordpress.org/ticket/26570">#26570</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststermphp">trunk/tests/phpunit/tests/term.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/taxonomy.php (28950 => 28951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/taxonomy.php 2014-07-02 00:33:11 UTC (rev 28950)
+++ trunk/src/wp-includes/taxonomy.php 2014-07-02 01:27:07 UTC (rev 28951)
</span><span class="lines">@@ -2617,14 +2617,14 @@
</span><span class="cx"> * @since 2.3.0
</span><span class="cx"> * @uses wp_remove_object_terms()
</span><span class="cx"> *
</span><del>- * @param int $object_id The object to relate to.
- * @param array|int|string $terms The slug or id of the term, will replace all existing
- * related terms in this taxonomy.
- * @param array|string $taxonomy The context in which to relate the term to the object.
- * @param bool $append If false will delete difference of terms.
- * @return array|WP_Error Affected Term IDs
</del><ins>+ * @param int $object_id The object to relate to.
+ * @param array|int|string $terms A single term slug, single term id, or array of either term slugs or ids.
+ * Will replace all existing related terms in this taxonomy.
+ * @param array|string $taxonomy The context in which to relate the term to the object.
+ * @param bool $append If false will delete difference of terms.
+ * @return array|WP_Error Affected Term IDs.
</ins><span class="cx"> */
</span><del>-function wp_set_object_terms($object_id, $terms, $taxonomy, $append = false) {
</del><ins>+function wp_set_object_terms( $object_id, $terms, $taxonomy, $append = false ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $object_id = (int) $object_id;
</span></span></pre></div>
<a id="trunktestsphpunitteststermphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/term.php (28950 => 28951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/term.php 2014-07-02 00:33:11 UTC (rev 28950)
+++ trunk/tests/phpunit/tests/term.php 2014-07-02 01:27:07 UTC (rev 28951)
</span><span class="lines">@@ -109,6 +109,94 @@
</span><span class="cx"> return $terms;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * @ticket 26570
+ */
+ function test_set_object_terms() {
+ $non_hier = rand_str( 10 );
+ $hier = rand_str( 10 );
+
+ // Register taxonomies
+ register_taxonomy( $non_hier, array() );
+ register_taxonomy( $hier, array( 'hierarchical' => true ) );
+
+ // Create a post.
+ $post_id = $this->factory->post->create();
+
+ /*
+ * Set a single term (non-hierarchical) by ID.
+ */
+ $tag = wp_insert_term( 'Foo', $non_hier );
+ $this->assertFalse( has_term( $tag['term_id'], $non_hier, $post_id ) );
+
+ wp_set_object_terms( $post_id, $tag['term_id'], $non_hier );
+ $this->assertTrue( has_term( $tag['term_id'], $non_hier, $post_id ) );
+
+ /*
+ * Set a single term (non-hierarchical) by slug.
+ */
+ $tag = wp_insert_term( 'Bar', $non_hier );
+ $tag = get_term( $tag['term_id'], $non_hier );
+
+ $this->assertFalse( has_term( $tag->slug, $non_hier, $post_id ) );
+
+ wp_set_object_terms( $post_id, $tag->slug, $non_hier );
+ $this->assertTrue( has_term( $tag->slug, $non_hier, $post_id ) );
+
+ /*
+ * Set a single term (hierarchical) by ID.
+ */
+ $cat = wp_insert_term( 'Baz', $hier );
+ $this->assertFalse( has_term( $cat['term_id'], $hier, $post_id ) );
+
+ wp_set_object_terms( $post_id, $cat['term_id'], $hier );
+ $this->assertTrue( has_term( $cat['term_id'], $hier, $post_id ) );
+
+ /*
+ * Set a single term (hierarchical) by slug.
+ */
+ $cat = wp_insert_term( 'Qux', $hier );
+ $cat = get_term( $cat['term_id'], $hier );
+
+ $this->assertFalse( has_term( $cat->slug, $hier, $post_id ) );
+
+ wp_set_object_terms( $post_id, $cat->slug, $hier );
+ $this->assertTrue( has_term( $cat->slug, $hier, $post_id ) );
+
+ /*
+ * Set an array of term IDs (non-hierarchical) by ID.
+ */
+ $tag1 = wp_insert_term( '_tag1', $non_hier );
+ $this->assertFalse( has_term( $tag1['term_id'], $non_hier, $post_id ) );
+
+ $tag2 = wp_insert_term( '_tag2', $non_hier );
+ $this->assertFalse( has_term( $tag2['term_id'], $non_hier, $post_id ) );
+
+ $tag3 = wp_insert_term( '_tag3', $non_hier );
+ $this->assertFalse( has_term( $tag3['term_id'], $non_hier, $post_id ) );
+
+ wp_set_object_terms( $post_id, array( $tag1['term_id'], $tag2['term_id'], $tag3['term_id'] ), $non_hier );
+ $this->assertTrue( has_term( array( $tag1['term_id'], $tag2['term_id'], $tag3['term_id'] ), $non_hier, $post_id ) );
+
+ /*
+ * Set an array of term slugs (hierarchical) by slug.
+ */
+ $cat1 = wp_insert_term( '_cat1', $hier );
+ $cat1 = get_term( $cat1['term_id'], $hier );
+ $this->assertFalse( has_term( $cat1->slug, $hier, $post_id ) );
+
+ $cat2 = wp_insert_term( '_cat2', $hier );
+ $cat2 = get_term( $cat2['term_id'], $hier );
+ $this->assertFalse( has_term( $cat2->slug, $hier, $post_id ) );
+
+ $cat3 = wp_insert_term( '_cat3', $hier );
+ $cat3 = get_term( $cat3['term_id'], $hier );
+ $this->assertFalse( has_term( $cat3->slug, $hier, $post_id ) );
+
+ wp_set_object_terms( $post_id, array( $cat1->slug, $cat2->slug, $cat3->slug ), $hier );
+ $this->assertTrue( has_term( array( $cat1->slug, $cat2->slug, $cat3->slug ), $hier, $post_id ) );
+ }
+
</ins><span class="cx"> function test_set_object_terms_by_id() {
</span><span class="cx"> $ids = $this->factory->post->create_many(5);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>