Make WordPress Core


Ignore:
Timestamp:
10/19/2011 09:43:02 PM (14 years ago)
Author:
ryan
Message:

Update meta box functions to handle WP_Screen objects and pass objects instead of IDs to them in core files. Allow passing emptiness to get the current screen. see #18958

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/edit-form-advanced.php

    r18941 r19013  
    100100require_once('./includes/meta-boxes.php');
    101101
    102 add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', $post_type, 'side', 'core');
     102add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', null, 'side', 'core');
    103103
    104104if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post_type, 'post-formats' ) )
    105     add_meta_box( 'formatdiv', _x( 'Format', 'post format' ), 'post_format_meta_box', $post_type, 'side', 'core' );
     105    add_meta_box( 'formatdiv', _x( 'Format', 'post format' ), 'post_format_meta_box', null, 'side', 'core' );
    106106
    107107// all taxonomies
     
    114114
    115115    if ( !is_taxonomy_hierarchical($tax_name) )
    116         add_meta_box('tagsdiv-' . $tax_name, $label, 'post_tags_meta_box', $post_type, 'side', 'core', array( 'taxonomy' => $tax_name ));
     116        add_meta_box('tagsdiv-' . $tax_name, $label, 'post_tags_meta_box', null, 'side', 'core', array( 'taxonomy' => $tax_name ));
    117117    else
    118         add_meta_box($tax_name . 'div', $label, 'post_categories_meta_box', $post_type, 'side', 'core', array( 'taxonomy' => $tax_name ));
     118        add_meta_box($tax_name . 'div', $label, 'post_categories_meta_box', null, 'side', 'core', array( 'taxonomy' => $tax_name ));
    119119}
    120120
    121121if ( post_type_supports($post_type, 'page-attributes') )
    122     add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', $post_type, 'side', 'core');
     122    add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', null, 'side', 'core');
    123123
    124124if ( current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' ) )
    125         add_meta_box('postimagediv', __('Featured Image'), 'post_thumbnail_meta_box', $post_type, 'side', 'low');
     125        add_meta_box('postimagediv', __('Featured Image'), 'post_thumbnail_meta_box', null, 'side', 'low');
    126126
    127127if ( post_type_supports($post_type, 'excerpt') )
    128     add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', $post_type, 'normal', 'core');
     128    add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', null, 'normal', 'core');
    129129
    130130if ( post_type_supports($post_type, 'trackbacks') )
    131     add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', $post_type, 'normal', 'core');
     131    add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', null, 'normal', 'core');
    132132
    133133if ( post_type_supports($post_type, 'custom-fields') )
    134     add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', $post_type, 'normal', 'core');
     134    add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', null, 'normal', 'core');
    135135
    136136do_action('dbx_post_advanced');
    137137if ( post_type_supports($post_type, 'comments') )
    138     add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', $post_type, 'normal', 'core');
     138    add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', null, 'normal', 'core');
    139139
    140140if ( ('publish' == $post->post_status || 'private' == $post->post_status) && post_type_supports($post_type, 'comments') )
    141     add_meta_box('commentsdiv', __('Comments'), 'post_comment_meta_box', $post_type, 'normal', 'core');
     141    add_meta_box('commentsdiv', __('Comments'), 'post_comment_meta_box', null, 'normal', 'core');
    142142
    143143if ( !( 'pending' == $post->post_status && !current_user_can( $post_type_object->cap->publish_posts ) ) )
    144     add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', $post_type, 'normal', 'core');
     144    add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', null, 'normal', 'core');
    145145
    146146if ( post_type_supports($post_type, 'author') ) {
    147147    if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) )
    148         add_meta_box('authordiv', __('Author'), 'post_author_meta_box', $post_type, 'normal', 'core');
     148        add_meta_box('authordiv', __('Author'), 'post_author_meta_box', null, 'normal', 'core');
    149149}
    150150
    151151if ( post_type_supports($post_type, 'revisions') && 0 < $post_ID && wp_get_post_revisions( $post_ID ) )
    152     add_meta_box('revisionsdiv', __('Revisions'), 'post_revisions_meta_box', $post_type, 'normal', 'core');
     152    add_meta_box('revisionsdiv', __('Revisions'), 'post_revisions_meta_box', null, 'normal', 'core');
    153153
    154154do_action('add_meta_boxes', $post_type, $post);
     
    348348}
    349349
    350 do_meta_boxes($post_type, 'normal', $post);
     350do_meta_boxes(null, 'normal', $post);
    351351
    352352( 'page' == $post_type ) ? do_action('edit_page_form') : do_action('edit_form_advanced');
    353353
    354 do_meta_boxes($post_type, 'advanced', $post);
     354do_meta_boxes(null, 'advanced', $post);
    355355
    356356do_action('dbx_post_sidebar'); ?>
Note: See TracChangeset for help on using the changeset viewer.