mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-08-11 12:20:22 +00:00
Assume current user of user ID is not passed. Props filosofo. fixes #11808
git-svn-id: https://develop.svn.wordpress.org/trunk@12650 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
@@ -99,15 +99,19 @@ foreach ( get_object_taxonomies($post_type) as $tax_name ) {
|
||||
|
||||
if ( is_object_in_taxonomy($post_type, 'category') )
|
||||
add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', $post_type, 'side', 'core');
|
||||
if ( current_theme_supports( 'post-thumbnails', $post_type ) )
|
||||
if ( current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports($post_type, 'post-thumbnails') )
|
||||
add_meta_box('postimagediv', __('Post Thumbnail'), 'post_thumbnail_meta_box', $post_type, 'side', 'low');
|
||||
add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', $post_type, 'normal', 'core');
|
||||
add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', $post_type, 'normal', 'core');
|
||||
add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', $post_type, 'normal', 'core');
|
||||
if ( post_type_supports($post_type, 'excerpts') )
|
||||
add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', $post_type, 'normal', 'core');
|
||||
if ( post_type_supports($post_type, 'trackbacks') )
|
||||
add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', $post_type, 'normal', 'core');
|
||||
if ( post_type_supports($post_type, 'custom-fields') )
|
||||
add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', $post_type, 'normal', 'core');
|
||||
do_action('dbx_post_advanced');
|
||||
add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', $post_type, 'normal', 'core');
|
||||
if ( post_type_supports($post_type, 'comments') )
|
||||
add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', $post_type, 'normal', 'core');
|
||||
|
||||
if ( 'publish' == $post->post_status || 'private' == $post->post_status )
|
||||
if ( ('publish' == $post->post_status || 'private' == $post->post_status) && post_type_supports($post_type, 'comments') )
|
||||
add_meta_box('commentsdiv', __('Comments'), 'post_comment_meta_box', $post_type, 'normal', 'core');
|
||||
|
||||
if ( !( 'pending' == $post->post_status && !current_user_can( 'publish_posts' ) ) )
|
||||
|
||||
+20
-14
@@ -75,26 +75,32 @@ $user_ID = (int) $user_ID;
|
||||
|
||||
require_once('includes/meta-boxes.php');
|
||||
|
||||
$post_type = 'page';
|
||||
|
||||
add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', 'page', 'side', 'core');
|
||||
add_meta_box('pageparentdiv', __('Attributes'), 'page_attributes_meta_box', 'page', 'side', 'core');
|
||||
add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', 'page', 'normal', 'core');
|
||||
add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', 'page', 'normal', 'core');
|
||||
add_meta_box('slugdiv', __('Page Slug'), 'post_slug_meta_box', 'page', 'normal', 'core');
|
||||
if ( current_theme_supports( 'post-thumbnails', 'page' ) )
|
||||
add_meta_box('postimagediv', __('Page Image'), 'post_thumbnail_meta_box', 'page', 'side', 'low');
|
||||
|
||||
if ( post_type_supports($post_type, 'page-attributes') )
|
||||
add_meta_box('pageparentdiv', __('Attributes'), 'page_attributes_meta_box', $post_type, 'side', 'core');
|
||||
if ( post_type_supports($post_type, 'custom-fields') )
|
||||
add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', $post_type, 'normal', 'core');
|
||||
if ( post_type_supports($post_type, 'comments') )
|
||||
add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', $post_type, 'normal', 'core');
|
||||
add_meta_box('slugdiv', __('Page Slug'), 'post_slug_meta_box', $post_type, 'normal', 'core');
|
||||
if ( current_theme_supports( 'post-thumbnails', 'page' ) && post_type_supports($post_type, 'post-thumbnails') )
|
||||
add_meta_box('postimagediv', __('Page Image'), 'post_thumbnail_meta_box', $post_type, 'side', 'low');
|
||||
|
||||
$authors = get_editable_user_ids( $current_user->id, true, 'page' ); // TODO: ROLE SYSTEM
|
||||
if ( $post->post_author && !in_array($post->post_author, $authors) )
|
||||
$authors[] = $post->post_author;
|
||||
if ( $authors && count( $authors ) > 1 )
|
||||
add_meta_box('pageauthordiv', __('Page Author'), 'post_author_meta_box', 'page', 'normal', 'core');
|
||||
add_meta_box('pageauthordiv', __('Page Author'), 'post_author_meta_box', $post_type, 'normal', 'core');
|
||||
|
||||
if ( 0 < $post_ID && wp_get_post_revisions( $post_ID ) )
|
||||
add_meta_box('revisionsdiv', __('Page Revisions'), 'post_revisions_meta_box', 'page', 'normal', 'core');
|
||||
add_meta_box('revisionsdiv', __('Page Revisions'), 'post_revisions_meta_box', $post_type, 'normal', 'core');
|
||||
|
||||
do_action('do_meta_boxes', 'page', 'normal', $post);
|
||||
do_action('do_meta_boxes', 'page', 'advanced', $post);
|
||||
do_action('do_meta_boxes', 'page', 'side', $post);
|
||||
do_action('do_meta_boxes', $post_type, 'normal', $post);
|
||||
do_action('do_meta_boxes', $post_type, 'advanced', $post);
|
||||
do_action('do_meta_boxes', $post_type, 'side', $post);
|
||||
|
||||
require_once('admin-header.php');
|
||||
?>
|
||||
@@ -128,7 +134,7 @@ require_once('admin-header.php');
|
||||
<div id="side-info-column" class="inner-sidebar">
|
||||
<?php
|
||||
do_action('submitpage_box');
|
||||
$side_meta_boxes = do_meta_boxes('page', 'side', $post); ?>
|
||||
$side_meta_boxes = do_meta_boxes($post_type, 'side', $post); ?>
|
||||
</div>
|
||||
|
||||
<div id="post-body">
|
||||
@@ -178,9 +184,9 @@ wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
|
||||
</div>
|
||||
|
||||
<?php
|
||||
do_meta_boxes('page', 'normal', $post);
|
||||
do_meta_boxes($post_type, 'normal', $post);
|
||||
do_action('edit_page_form');
|
||||
do_meta_boxes('page', 'advanced', $post);
|
||||
do_meta_boxes($post_type, 'advanced', $post);
|
||||
?>
|
||||
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user