Changeset 48043

Timestamp:

06/14/2020 09:40:10 PM (4 years ago)

Author:

SergeyBiryukov

Message:

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 #43516.

Location:

trunk

Files:

• src/wp-includes/post.php (modified) (2 diffs)
• tests/phpunit/tests/term.php (modified) (3 diffs)

trunk/src/wp-includes/post.php

@@ -4690 +4690 @@
  * Set categories for a post.
  *
- * If the post categories parameter is not set, then the default category is
- * going used.
+ * If no categories are provided, the default category is used.
  *
  * @since 2.1.0
@@ -4707 +4706 @@
     $post_type   = get_post_type( $post_ID );
     $post_status = get_post_status( $post_ID );
-    // If $post_categories isn't already an array, make it one:
+
+    // If $post_categories isn't already an array, make it one.
     $post_categories = (array) $post_categories;
+
     if ( empty( $post_categories ) ) {
-        if ( 'post' === $post_type && 'auto-draft' !== $post_status ) {
+        /**
+         * 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
+        ) {
             $post_categories = array( get_option( 'default_category' ) );
             $append          = false;

trunk/tests/phpunit/tests/term.php

@@ -157 +157 @@
         $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 ) );
@@ -168 +170 @@
 
         $term4 = wp_insert_term( 'Burrito', 'category' );
+
         wp_set_post_categories( $post_id, $term4['term_id'] );
         $this->assertEquals( array( $term4['term_id'] ), $post->post_category );
@@ -181 +184 @@
         $this->assertEquals( 1, count( $post->post_category ) );
         $this->assertEquals( get_option( 'default_category' ), $post->post_category[0] );
+    }
+
+    /**
+     * @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;
     }