Ticket #36462: patch.diff

wp-admin/includes/meta-boxes.php

@@ -657 +657 @@
 ?>
 <input name="advanced_view" type="hidden" value="1" />
 <p class="meta-options">
-        <label for="comment_status" class="selectit"><input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /> <?php _e( 'Allow comments.' ) ?></label><br />
-        <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php
+        <label for="comment_status" class="selectit"><input name="comment_status" type="hidden" value="closed"><input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /> <?php _e( 'Allow comments.' ) ?></label><br />
+        <label for="ping_status" class="selectit"><input name="ping_status" type="hidden" value="closed"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php
                 printf(
                         /* translators: %s: Codex URL */
                         __( 'Allow <a href="%s">trackbacks and pingbacks</a> on this page.' ),

wp-admin/includes/post.php

@@ -128 +128 @@
 
         if ( isset( $post_data['post_password'] ) && ! current_user_can( $ptype->cap->publish_posts ) ) {
                 unset( $post_data['post_password'] );
-        }
 
-        if (!isset( $post_data['comment_status'] ))
-                $post_data['comment_status'] = 'closed';
-
-        if (!isset( $post_data['ping_status'] ))
-                $post_data['ping_status'] = 'closed';
-
         foreach ( array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
                 if ( !empty( $post_data['hidden_' . $timeunit] ) && $post_data['hidden_' . $timeunit] != $post_data[$timeunit] ) {
                         $post_data['edit_date'] = '1';