<!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>[48043] trunk: Posts, Post Types: Introduce `default_category_post_types` filter.</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 { white-space: pre-line; 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/48043">48043</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/48043","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-06-14 21:40:10 +0000 (Sun, 14 Jun 2020)</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'>Posts, Post Types: Introduce `default_category_post_types` filter.
The filter allows custom post types associated with the `category` taxonomy to opt in to requiring a default category, same as regular posts.
Props enrico.sorcinelli.
Fixes <a href="https://core.trac.wordpress.org/ticket/43516">#43516</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 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2020-06-14 17:01:51 UTC (rev 48042)
+++ trunk/src/wp-includes/post.php 2020-06-14 21:40:10 UTC (rev 48043)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4689,8 +4689,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Set categories for a post.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * If the post categories parameter is not set, then the default category is
- * going used.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If no categories are provided, the default category is used.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4706,10 +4705,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_ID = (int) $post_ID;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = get_post_type( $post_ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_status = get_post_status( $post_ID );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If $post_categories isn't already an array, make it one:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // If $post_categories isn't already an array, make it one.
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_categories = (array) $post_categories;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $post_categories ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' === $post_type && 'auto-draft' !== $post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Filters post types (in addition to 'post') that require a default category.
+ *
+ * @since 5.5.0
+ *
+ * @param array $post_types An array of post types. Default empty array.
+ */
+ $default_category_post_types = apply_filters( 'default_category_post_types', array() );
+
+ // Regular posts always require a default category.
+ $default_category_post_types = array_merge( $default_category_post_types, array( 'post' ) );
+
+ if ( in_array( $post_type, $default_category_post_types, true )
+ && is_object_in_taxonomy( $post_type, 'category' )
+ && 'auto-draft' !== $post_status
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_categories = array( get_option( 'default_category' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $append = false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunktestsphpunitteststermphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term.php 2020-06-14 17:01:51 UTC (rev 48042)
+++ trunk/tests/phpunit/tests/term.php 2020-06-14 21:40:10 UTC (rev 48043)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,9 +156,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $post->post_category );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, count( $post->post_category ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_option( 'default_category' ), $post->post_category[0] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $term1 = wp_insert_term( 'Foo', 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $term2 = wp_insert_term( 'Bar', 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $term3 = wp_insert_term( 'Baz', 'category' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_categories( $post_id, array( $term1['term_id'], $term2['term_id'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, count( $post->post_category ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( $term2['term_id'], $term1['term_id'] ), $post->post_category );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,6 +169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( $term2['term_id'], $term3['term_id'], $term1['term_id'] ), $post->post_category );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term4 = wp_insert_term( 'Burrito', 'category' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_categories( $post_id, $term4['term_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( $term4['term_id'] ), $post->post_category );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,6 +186,35 @@
</span><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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 43516
+ */
+ function test_wp_set_post_categories_sets_default_category_for_custom_post_types() {
+ add_filter( 'default_category_post_types', array( $this, 'filter_default_category_post_types' ) );
+
+ register_post_type( 'cpt', array( 'taxonomies' => array( 'category' ) ) );
+
+ $post_id = self::factory()->post->create( array( 'post_type' => 'cpt' ) );
+ $post = get_post( $post_id );
+
+ $this->assertEquals( get_option( 'default_category' ), $post->post_category[0] );
+
+ $term = wp_insert_term( 'Foo', 'category' );
+
+ wp_set_post_categories( $post_id, $term['term_id'] );
+ $this->assertEquals( $term['term_id'], $post->post_category[0] );
+
+ wp_set_post_categories( $post_id, array() );
+ $this->assertEquals( get_option( 'default_category' ), $post->post_category[0] );
+
+ remove_filter( 'default_category_post_types', array( $this, 'filter_default_category_post_types' ) );
+ }
+
+ function filter_default_category_post_types( $post_types ) {
+ $post_types[] = 'cpt';
+ return $post_types;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25852
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_sanitize_term_field() {
</span></span></pre>
</div>
</div>
</body>
</html>