Ticket #50648: 50648.patch

src/wp-admin/options-writing.php

@@ -80 +80 @@
 <?php
 wp_dropdown_categories(
         array(
-                'hide_empty'   => 0,
-                'name'         => 'default_category',
-                'orderby'      => 'name',
-                'selected'     => get_option( 'default_category' ),
-                'hierarchical' => true,
+                'hide_empty'        => 0,
+                'name'              => 'default_category',
+                'orderby'           => 'name',
+                'selected'          => get_option( 'default_category' ),
+                'hierarchical'      => true,
+                'show_option_none'  => __( '-- none --' ),
+                'option_none_value' => 0,
         )
 );
 ?>
@@ -174 +176 @@
         <?php
         wp_dropdown_categories(
                 array(
-                        'hide_empty'   => 0,
-                        'name'         => 'default_email_category',
-                        'orderby'      => 'name',
-                        'selected'     => get_option( 'default_email_category' ),
-                        'hierarchical' => true,
+                        'hide_empty'        => 0,
+                        'name'              => 'default_email_category',
+                        'orderby'           => 'name',
+                        'selected'          => get_option( 'default_email_category' ),
+                        'hierarchical'      => true,
+                        'show_option_none'  => __( '-- none --' ),
+                        'option_none_value' => 0,
                 )
         );
         ?>

src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php

@@ -1402 +1402 @@
                                 continue;
                         }
 
+                        // Empty terms checks.
+                        if ( empty( $request[ $base ] ) ) {
+
+                                $default_term = null;
+
+                                // Built-in taxonomy.
+                                if ( 'category' === $taxonomy->name ) {
+                                        $default_term = get_option( 'default_category' );
+                                }
+                                // Custom taxonomies.
+                                elseif ( ! empty( $taxonomy->default_term ) ) {
+                                        $default_term = get_option( 'default_term_' . $taxonomy->name );
+                                }
+
+                                if ( ! empty( $default_term ) ) {
+                                        $request[ $base ] = array( (int)$default_term );
+                                }
+                        }
+
                         $result = wp_set_object_terms( $post_id, $request[ $base ], $taxonomy->name );
 
                         if ( is_wp_error( $result ) ) {

tests/phpunit/tests/rest-api/rest-posts-controller.php

@@ -3445 +3445 @@
                 $request->set_body_params( $params );
                 $response = rest_get_server()->dispatch( $request );
                 $new_data = $response->get_data();
+                $this->assertEquals( array( 1 ), $new_data['categories'] );
+
+                // Check with empty default category settings.
+                $default_term = get_option( 'default_category' );
+                update_option( 'default_category', 0 );
+                $request->set_body_params( $params );
+                $response = rest_get_server()->dispatch( $request );
+                $new_data = $response->get_data();
                 $this->assertEquals( array(), $new_data['categories'] );
+                update_option( 'default_category', $default_term );
         }
 
         /**