WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Timestamp:
01/11/2010 09:42:45 PM (15 years ago)
Author:
ryan
Message:

Merge edit-page-form.php into edit-form-advanced.php. see #9674

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/edit-form-advanced.php

    r12682 r12695  
    1717 */
    1818$post_ID = isset($post_ID) ? (int) $post_ID : 0;
    19 
     19$temp_ID = isset($temp_ID) ? (int) $temp_ID : 0;
     20$user_ID = isset($user_ID) ? (int) $user_ID : 0;
    2021$action = isset($action) ? $action : '';
     22
     23$messages = array();
     24$messages['post'] = array(
     25    '',
     26    sprintf( __('Post updated. <a href="%s">View post</a>'), get_permalink($post_ID) ),
     27    __('Custom field updated.'),
     28    __('Custom field deleted.'),
     29    __('Post updated.'),
     30    isset($_GET['revision']) ? sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
     31    sprintf( __('Post published. <a href="%s">View post</a>'), get_permalink($post_ID) ),
     32    __('Post saved.'),
     33    sprintf( __('Post submitted. <a target="_blank" href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ),
     34    // translators: Publish box date format, see http://php.net/date - Same as in meta-boxes.php
     35    sprintf( __('Post scheduled for: <b>%1$s</b>. <a target="_blank" href="%2$s">Preview post</a>'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), get_permalink($post_ID) ),
     36    sprintf( __('Post draft updated. <a target="_blank" href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) )
     37);
     38$messages['page'] = array(
     39    '',
     40    sprintf( __('Page updated. <a href="%s">View page</a>'), get_permalink($post_ID) ),
     41    __('Custom field updated.'),
     42    __('Custom field deleted.'),
     43    sprintf( __('Page published. <a href="%s">View page</a>'), get_permalink($post_ID) ),
     44    isset($_GET['revision']) ? sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
     45    sprintf( __('Page submitted. <a target="_blank" href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ),
     46    // translators: Publish box date format, see http://php.net/date - Same as in meta-boxes.php
     47    sprintf( __('Page scheduled for: <b>%1$s</b>. <a target="_blank" href="%2$s">Preview page</a>'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), get_permalink($post_ID) ),
     48    sprintf( __('Page draft updated. <a target="_blank" href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) )
     49);
    2150
    2251$message = false;
    2352if ( isset($_GET['message']) ) {
    2453    $_GET['message'] = absint( $_GET['message'] );
    25 
    26     switch ( $_GET['message'] ) {
    27         case 1:
    28             $message = sprintf( __('Post updated. <a href="%s">View post</a>'), get_permalink($post_ID) );
    29             break;
    30         case 2:
    31             $message = __('Custom field updated.');
    32             break;
    33         case 3:
    34             $message = __('Custom field deleted.');
    35             break;
    36         case 4:
    37             $message = __('Post updated.');
    38             break;
    39         case 5:
    40             if ( isset($_GET['revision']) )
    41                 $message = sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) );
    42             break;
    43         case 6:
    44             $message = sprintf( __('Post published. <a href="%s">View post</a>'), get_permalink($post_ID) );
    45             break;
    46         case 7:
    47             $message = __('Post saved.');
    48             break;
    49         case 8:
    50             $message = sprintf( __('Post submitted. <a target="_blank" href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) );
    51             break;
    52         case 9:
    53             // translators: Publish box date formt, see http://php.net/date - Same as in meta-boxes.php
    54             $message = sprintf( __('Post scheduled for: <b>%1$s</b>. <a target="_blank" href="%2$s">Preview post</a>'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), get_permalink($post_ID) );
    55             break;
    56         case 10:
    57             $message = sprintf( __('Post draft updated. <a target="_blank" href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) );
    58             break;
    59     }
     54    if ( isset($messages[$post_type][$_GET['message']]) )
     55        $message = $messages[$post_type][$_GET['message']];
     56    elseif ( !isset($messages[$post_type]) && isset($messages['post'][$_GET['message']]) )
     57        $message = $messages['post'][$_GET['message']];
    6058}
    6159
    … …  
    6361if ( 0 == $post_ID ) {
    6462    $form_action = 'post';
     63    $nonce_action = 'add-' . $post_type;
    6564    $temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post()
    6665    $form_extra = "<input type='hidden' id='post_ID' name='temp_ID' value='" . esc_attr($temp_ID) . "' />";
    … …  
    6867} else {
    6968    $form_action = 'editpost';
     69    $nonce_action = 'update-' . $post_type . '_' . $post_ID;
    7070    $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='" . esc_attr($post_ID) . "' />";
    7171    $autosave = wp_get_post_autosave( $post_ID );
    … …  
    8383}
    8484
     85$post_type_object = get_post_type_object($post_type);
     86$post_type_cap = $post_type_object->capability_type;
     87$form_post = 'post.php';
     88if ( 'page' == $post_type )
     89    $form_post = 'page.php';
     90
    8591// All meta boxes should be defined and added before the first do_meta_boxes() call (or potentially during the do_meta_boxes action).
    8692require_once('includes/meta-boxes.php');
    … …  
    8894add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', $post_type, 'side', 'core');
    8995
    90 // all tag-style post taxonomies
     96// all tag-style taxonomies
    9197foreach ( get_object_taxonomies($post_type) as $tax_name ) {
    9298    if ( !is_taxonomy_hierarchical($tax_name) ) {
    … …  
    100106if ( is_object_in_taxonomy($post_type, 'category') )
    101107    add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', $post_type, 'side', 'core');
     108
     109if ( post_type_supports($post_type, 'page-attributes') )
     110    add_meta_box('pageparentdiv', __('Attributes'), 'page_attributes_meta_box', $post_type, 'side', 'core');
     111
    102112if ( current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports($post_type, 'post-thumbnails') )
    103113    add_meta_box('postimagediv', __('Post Thumbnail'), 'post_thumbnail_meta_box', $post_type, 'side', 'low');
     114
    104115if ( post_type_supports($post_type, 'excerpts') )
    105116    add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', $post_type, 'normal', 'core');
     117
    106118if ( post_type_supports($post_type, 'trackbacks') )
    107119    add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', $post_type, 'normal', 'core');
     120
    108121if ( post_type_supports($post_type, 'custom-fields') )
    109122    add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', $post_type, 'normal', 'core');
     123
    110124do_action('dbx_post_advanced');
    111125if ( post_type_supports($post_type, 'comments') )
    … …  
    116130
    117131if ( !( 'pending' == $post->post_status && !current_user_can( 'publish_posts' ) ) )
    118     add_meta_box('slugdiv', __('Post Slug'), 'post_slug_meta_box', $post_type, 'normal', 'core');
     132    add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', $post_type, 'normal', 'core');
    119133
    120134$authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
    … …  
    122136    $authors[] = $post->post_author;
    123137if ( $authors && count( $authors ) > 1 )
    124     add_meta_box('authordiv', __('Post Author'), 'post_author_meta_box', $post_type, 'normal', 'core');
     138    add_meta_box('authordiv', __('Author'), 'post_author_meta_box', $post_type, 'normal', 'core');
    125139
    126140if ( 0 < $post_ID && wp_get_post_revisions( $post_ID ) )
    127     add_meta_box('revisionsdiv', __('Post Revisions'), 'post_revisions_meta_box', $post_type, 'normal', 'core');
     141    add_meta_box('revisionsdiv', __('Revisions'), 'post_revisions_meta_box', $post_type, 'normal', 'core');
    128142
    129143do_action('do_meta_boxes', $post_type, 'normal', $post);
    … …  
    132146
    133147require_once('admin-header.php');
    134 
    135148?>
    136149
    … …  
    144157<div id="message" class="updated"><p><?php echo $message; ?></p></div>
    145158<?php endif; ?>
    146 <form name="post" action="post.php" method="post" id="post">
    147 <?php
    148 
    149 if ( 0 == $post_ID)
    150     wp_nonce_field('add-post');
    151 else
    152     wp_nonce_field('update-post_' .  $post_ID);
    153 
    154 ?>
    155 
     159<form name="post" action="<?php echo $form_post; ?>" method="post" id="post">
     160<?php wp_nonce_field($nonce_action); ?>
    156161<input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $user_ID ?>" />
    157162<input type="hidden" id="hiddenaction" name="action" value="<?php echo esc_attr($form_action) ?>" />
    … …  
    170175<div id="side-info-column" class="inner-sidebar">
    171176
    172 <?php do_action('submitpost_box'); ?>
    173 
    174 <?php $side_meta_boxes = do_meta_boxes($post_type, 'side', $post); ?>
     177<?php
     178('page' == $post_type) ? do_action('submitpage_box') : do_action('submitpost_box');
     179$side_meta_boxes = do_meta_boxes($post_type, 'side', $post);
     180?>
    175181</div>
    176182
    … …  
    185191<?php
    186192$sample_permalink_html = get_sample_permalink_html($post->ID);
    187 if ( !( 'pending' == $post->post_status && !current_user_can( 'publish_posts' ) ) ) { ?>
     193if ( !( 'pending' == $post->post_status && !current_user_can( 'publish_' . $post_type_cap . 's' ) ) ) { ?>
    188194    <div id="edit-slug-box">
    189195<?php
    … …  
    231237do_meta_boxes($post_type, 'normal', $post);
    232238
    233 do_action('edit_form_advanced');
     239( 'page' == $post_type ) ? do_action('edit_page_form') : do_action('edit_form_advanced');
    234240
    235241do_meta_boxes($post_type, 'advanced', $post);
Note: See TracChangeset for help on using the changeset viewer.