Ticket #28080: 28080.patch

src/wp-admin/edit-form-advanced.php

@@ -199 +199 @@
         add_meta_box( $tax_meta_box_id, $label, $taxonomy->meta_box_cb, null, 'side', 'core', array( 'taxonomy' => $tax_name ) );
 }
 
-if ( post_type_supports($post_type, 'page-attributes') )
-        add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', null, 'side', 'core');
+if ( post_type_supports( $post_type, 'page-attributes' ) ) {
+        add_meta_box( 'pageparentdiv', 'page' == $post_type ? __( 'Page Attributes' ) : __( 'Attributes' ), 'page_attributes_meta_box', null, 'side', 'core' );
+}
 
-if ( $thumbnail_support && current_user_can( 'upload_files' ) )
-        add_meta_box('postimagediv', __('Featured Image'), 'post_thumbnail_meta_box', null, 'side', 'low');
+if ( $thumbnail_support && current_user_can( 'upload_files' ) ) {
+        add_meta_box( 'postimagediv', __( 'Featured Image' ), 'post_thumbnail_meta_box', null, 'side', 'low' );
+}
 
-if ( post_type_supports($post_type, 'excerpt') )
-        add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', null, 'normal', 'core');
+if ( post_type_supports( $post_type, 'excerpt' ) ) {
+        add_meta_box( 'postexcerpt', __( 'Excerpt' ), 'post_excerpt_meta_box', null, 'normal', 'core' );
+}
 
-if ( post_type_supports($post_type, 'trackbacks') )
-        add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', null, 'normal', 'core');
+if ( post_type_supports( $post_type, 'trackbacks' ) ) {
+        add_meta_box( 'trackbacksdiv', __( 'Send Trackbacks' ), 'post_trackback_meta_box', null, 'normal', 'core' );
+}
 
-if ( post_type_supports($post_type, 'custom-fields') )
-        add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', null, 'normal', 'core');
+if ( post_type_supports( $post_type, 'custom-fields' ) ) {
+        add_meta_box( 'postcustom', __( 'Custom Fields' ), 'post_custom_meta_box', null, 'normal', 'core' );
+}
 
 /**
  * Fires in the middle of built-in meta box registration.
  *
- * @since 2.1.0
+ * @since      2.1.0
  * @deprecated 3.7.0 Use 'add_meta_boxes' instead.
  *
  * @param WP_Post $post Post object.
@@ -224 +229 @@
  */
 do_action( 'dbx_post_advanced', $post );
 
-if ( post_type_supports($post_type, 'comments') )
-        add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', null, 'normal', 'core');
+if ( comments_open( $post ) || pings_open( $post ) || post_type_supports( $post_type, 'comments' ) ) {
+        add_meta_box( 'commentstatusdiv', __( 'Discussion' ), 'post_comment_status_meta_box', null, 'normal', 'core' );
+}
 
-if ( ( 'publish' == get_post_status( $post ) || 'private' == get_post_status( $post ) ) && post_type_supports($post_type, 'comments') )
-        add_meta_box('commentsdiv', __('Comments'), 'post_comment_meta_box', null, 'normal', 'core');
+if ( ( 'publish' == get_post_status( $post ) || 'private' == get_post_status( $post ) ) && ( comments_open( $post ) || pings_open( $post ) || post_type_supports( $post_type, 'comments' ) ) ) {
+        add_meta_box( 'commentsdiv', __( 'Comments' ), 'post_comment_meta_box', null, 'normal', 'core' );
+}
 
-if ( ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) )
-        add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', null, 'normal', 'core');
+if ( ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) ) {
+        add_meta_box( 'slugdiv', __( 'Slug' ), 'post_slug_meta_box', null, 'normal', 'core' );
+}
 
-if ( post_type_supports($post_type, 'author') ) {
-        if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) )
-                add_meta_box('authordiv', __('Author'), 'post_author_meta_box', null, 'normal', 'core');
+if ( post_type_supports( $post_type, 'author' ) ) {
+        if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) ) {
+                add_meta_box( 'authordiv', __( 'Author' ), 'post_author_meta_box', null, 'normal', 'core' );
+        }
 }
 
 /**