Ticket #41336: 41336.2.diff

src/wp-includes/class-wp-customize-manager.php

@@ -2297 +2297 @@
                         }
                 }
 
+                if ( ! empty( $is_future_dated ) && 'publish' === $args['status'] ) {
+                        $args['status'] = 'future';
+                }
+
                 // The request was made via wp.customize.previewer.save().
                 $update_transactionally = (bool) $args['status'];
                 $allow_revision = (bool) $args['status'];

tests/phpunit/tests/customize/manager.php

@@ -1291 +1291 @@
                 $this->assertEquals( 'Unfiltered<script>evil</script>', get_option( 'scratchpad' ) );
         }
 
+        function test_publish_changeset_with_future_status_when_future_date() {
+                $wp_customize = $this->create_test_manager( wp_generate_uuid4() );
+
+                $wp_customize->save_changeset_post( array(
+                        'date_gmt' => gmdate( 'Y-m-d H:i:s', strtotime( '+1 day' ) ),
+                        'status' => 'publish',
+                        'title' => 'Foo',
+                ) );
+
+                $this->assertSame( 'future', get_post_status( $wp_customize->changeset_post_id() ) );
+        }
+
         /**
          * Ensure that save_changeset_post method bails updating an underlying changeset which is invalid.
          *