<!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>[25234] trunk: Allow `int` to be passed in lieu of `array`, add `append` arg to `wp_set_post_categories()`.</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/25234">25234</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-04 17:41:03 +0000 (Wed, 04 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow `int` to be passed in lieu of `array`, add `append` arg to `wp_set_post_categories()`. Adds more extensive unit tests for `wp_set_post_categories()`.
Props ptahdunbar for initial patch.
Fixes <a href="http://core.trac.wordpress.org/ticket/16550">#16550</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.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="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/post.php (25233 => 25234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/post.php 2013-09-04 17:39:43 UTC (rev 25233)
+++ trunk/src/wp-includes/post.php 2013-09-04 17:41:03 UTC (rev 25234)
</span><span class="lines">@@ -3228,24 +3228,28 @@
</span><span class="cx"> * @since 2.1.0
</span><span class="cx"> *
</span><span class="cx"> * @param int $post_ID Post ID.
</span><del>- * @param array $post_categories Optional. List of categories.
</del><ins>+ * @param array|int $post_categories Optional. List of categories or ID of category.
+ * @param bool $append If true, don't delete existing categories, just add on. If false, replace the categories with the new categories.
</ins><span class="cx"> * @return bool|mixed
</span><span class="cx"> */
</span><del>-function wp_set_post_categories($post_ID = 0, $post_categories = array()) {
</del><ins>+function wp_set_post_categories( $post_ID = 0, $post_categories = array(), $append = false ) {
</ins><span class="cx"> $post_ID = (int) $post_ID;
</span><span class="cx"> $post_type = get_post_type( $post_ID );
</span><span class="cx"> $post_status = get_post_status( $post_ID );
</span><span class="cx"> // If $post_categories isn't already an array, make it one:
</span><del>- if ( !is_array($post_categories) || empty($post_categories) ) {
- if ( 'post' == $post_type && 'auto-draft' != $post_status )
</del><ins>+ $post_categories = (array) $post_categories;
+ if ( empty( $post_categories ) ) {
+ if ( 'post' == $post_type && 'auto-draft' != $post_status ) {
</ins><span class="cx"> $post_categories = array( get_option('default_category') );
</span><del>- else
</del><ins>+ $append = false;
+ } else {
</ins><span class="cx"> $post_categories = array();
</span><ins>+ }
</ins><span class="cx"> } else if ( 1 == count($post_categories) && '' == reset($post_categories) ) {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return wp_set_post_terms($post_ID, $post_categories, 'category');
</del><ins>+ return wp_set_post_terms( $post_ID, $post_categories, 'category', $append );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunktestsphpunitteststermphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/term.php (25233 => 25234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/term.php 2013-09-04 17:39:43 UTC (rev 25233)
+++ trunk/tests/phpunit/tests/term.php 2013-09-04 17:41:03 UTC (rev 25234)
</span><span class="lines">@@ -466,4 +466,37 @@
</span><span class="cx"> $this->assertEquals( $tag_id, $terms[0]->term_id );
</span><span class="cx"> $this->assertEquals( 'This description is even more amazing!', $terms[0]->description );
</span><span class="cx"> }
</span><ins>+
+ function test_wp_set_post_categories() {
+ $post_id = $this->factory->post->create();
+ $post = get_post( $post_id );
+
+ $this->assertInternalType( 'array', $post->post_category );
+ $this->assertEquals( 1, count( $post->post_category ) );
+ $this->assertEquals( get_option( 'default_category' ), $post->post_category[0] );
+ $term1 = wp_insert_term( 'Foo', 'category' );
+ $term2 = wp_insert_term( 'Bar', 'category' );
+ $term3 = wp_insert_term( 'Baz', 'category' );
+ wp_set_post_categories( $post_id, array( $term1['term_id'], $term2['term_id'] ) );
+ $this->assertEquals( 2, count( $post->post_category ) );
+ $this->assertEquals( array( $term2['term_id'], $term1['term_id'] ) , $post->post_category );
+
+ wp_set_post_categories( $post_id, $term3['term_id'], true );
+ $this->assertEquals( array( $term2['term_id'], $term3['term_id'], $term1['term_id'] ) , $post->post_category );
+
+ $term4 = wp_insert_term( 'Burrito', 'category' );
+ wp_set_post_categories( $post_id, $term4['term_id'] );
+ $this->assertEquals( array( $term4['term_id'] ), $post->post_category );
+
+ wp_set_post_categories( $post_id, array( $term1['term_id'], $term2['term_id'] ), true );
+ $this->assertEquals( array( $term2['term_id'], $term4['term_id'],$term1['term_id'] ), $post->post_category );
+
+ wp_set_post_categories( $post_id, array(), true );
+ $this->assertEquals( 1, count( $post->post_category ) );
+ $this->assertEquals( get_option( 'default_category' ), $post->post_category[0] );
+
+ wp_set_post_categories( $post_id, array() );
+ $this->assertEquals( 1, count( $post->post_category ) );
+ $this->assertEquals( get_option( 'default_category' ), $post->post_category[0] );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>