<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12695] trunk/wp-admin: Merge edit-page-form.php into edit-form-advanced.
php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12695">12695</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-11 21:42:45 +0000 (Mon, 11 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge edit-page-form.php into edit-form-advanced.php. see <a href="http://trac.wordpress.org/ticket/9674">#9674</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadminpagenewphp">trunk/wp-admin/page-new.php</a></li>
<li><a href="#trunkwpadminpagephp">trunk/wp-admin/page.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpadmineditpageformphp">trunk/wp-admin/edit-page-form.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (12694 => 12695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2010-01-11 19:27:44 UTC (rev 12694)
+++ trunk/wp-admin/edit-form-advanced.php 2010-01-11 21:42:45 UTC (rev 12695)
</span><span class="lines">@@ -16,57 +16,57 @@
</span><span class="cx"> * @var int
</span><span class="cx"> */
</span><span class="cx"> $post_ID = isset($post_ID) ? (int) $post_ID : 0;
</span><del>-
</del><ins>+$temp_ID = isset($temp_ID) ? (int) $temp_ID : 0;
+$user_ID = isset($user_ID) ? (int) $user_ID : 0;
</ins><span class="cx"> $action = isset($action) ? $action : '';
</span><span class="cx">
</span><ins>+$messages = array();
+$messages['post'] = array(
+ '',
+ sprintf( __('Post updated. <a href="%s">View post</a>'), get_permalink($post_ID) ),
+ __('Custom field updated.'),
+ __('Custom field deleted.'),
+ __('Post updated.'),
+ isset($_GET['revision']) ? sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+ sprintf( __('Post published. <a href="%s">View post</a>'), get_permalink($post_ID) ),
+ __('Post saved.'),
+ sprintf( __('Post submitted. <a target="_blank" href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ),
+ // translators: Publish box date format, see http://php.net/date - Same as in meta-boxes.php
+ 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) ),
+ sprintf( __('Post draft updated. <a target="_blank" href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) )
+);
+$messages['page'] = array(
+ '',
+ sprintf( __('Page updated. <a href="%s">View page</a>'), get_permalink($post_ID) ),
+ __('Custom field updated.'),
+ __('Custom field deleted.'),
+ sprintf( __('Page published. <a href="%s">View page</a>'), get_permalink($post_ID) ),
+ isset($_GET['revision']) ? sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+ sprintf( __('Page submitted. <a target="_blank" href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ),
+ // translators: Publish box date format, see http://php.net/date - Same as in meta-boxes.php
+ 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) ),
+ sprintf( __('Page draft updated. <a target="_blank" href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) )
+);
+
</ins><span class="cx"> $message = false;
</span><span class="cx"> if ( isset($_GET['message']) ) {
</span><span class="cx"> $_GET['message'] = absint( $_GET['message'] );
</span><del>-
- switch ( $_GET['message'] ) {
- case 1:
- $message = sprintf( __('Post updated. <a href="%s">View post</a>'), get_permalink($post_ID) );
- break;
- case 2:
- $message = __('Custom field updated.');
- break;
- case 3:
- $message = __('Custom field deleted.');
- break;
- case 4:
- $message = __('Post updated.');
- break;
- case 5:
- if ( isset($_GET['revision']) )
- $message = sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) );
- break;
- case 6:
- $message = sprintf( __('Post published. <a href="%s">View post</a>'), get_permalink($post_ID) );
- break;
- case 7:
- $message = __('Post saved.');
- break;
- case 8:
- $message = sprintf( __('Post submitted. <a target="_blank" href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) );
- break;
- case 9:
- // translators: Publish box date formt, see http://php.net/date - Same as in meta-boxes.php
- $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) );
- break;
- case 10:
- $message = sprintf( __('Post draft updated. <a target="_blank" href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) );
- break;
- }
</del><ins>+ if ( isset($messages[$post_type][$_GET['message']]) )
+ $message = $messages[$post_type][$_GET['message']];
+ elseif ( !isset($messages[$post_type]) && isset($messages['post'][$_GET['message']]) )
+ $message = $messages['post'][$_GET['message']];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $notice = false;
</span><span class="cx"> if ( 0 == $post_ID ) {
</span><span class="cx"> $form_action = 'post';
</span><ins>+ $nonce_action = 'add-' . $post_type;
</ins><span class="cx"> $temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post()
</span><span class="cx"> $form_extra = "<input type='hidden' id='post_ID' name='temp_ID' value='" . esc_attr($temp_ID) . "' />";
</span><span class="cx"> $autosave = false;
</span><span class="cx"> } else {
</span><span class="cx"> $form_action = 'editpost';
</span><ins>+ $nonce_action = 'update-' . $post_type . '_' . $post_ID;
</ins><span class="cx"> $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='" . esc_attr($post_ID) . "' />";
</span><span class="cx"> $autosave = wp_get_post_autosave( $post_ID );
</span><span class="cx">
</span><span class="lines">@@ -82,12 +82,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+$post_type_object = get_post_type_object($post_type);
+$post_type_cap = $post_type_object->capability_type;
+$form_post = 'post.php';
+if ( 'page' == $post_type )
+ $form_post = 'page.php';
+
</ins><span class="cx"> // All meta boxes should be defined and added before the first do_meta_boxes() call (or potentially during the do_meta_boxes action).
</span><span class="cx"> require_once('includes/meta-boxes.php');
</span><span class="cx">
</span><span class="cx"> add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', $post_type, 'side', 'core');
</span><span class="cx">
</span><del>-// all tag-style post taxonomies
</del><ins>+// all tag-style taxonomies
</ins><span class="cx"> foreach ( get_object_taxonomies($post_type) as $tax_name ) {
</span><span class="cx"> if ( !is_taxonomy_hierarchical($tax_name) ) {
</span><span class="cx"> $taxonomy = get_taxonomy($tax_name);
</span><span class="lines">@@ -99,14 +105,22 @@
</span><span class="cx">
</span><span class="cx"> if ( is_object_in_taxonomy($post_type, 'category') )
</span><span class="cx"> add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', $post_type, 'side', 'core');
</span><ins>+
+if ( post_type_supports($post_type, 'page-attributes') )
+ add_meta_box('pageparentdiv', __('Attributes'), 'page_attributes_meta_box', $post_type, 'side', 'core');
+
</ins><span class="cx"> if ( current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports($post_type, 'post-thumbnails') )
</span><span class="cx"> add_meta_box('postimagediv', __('Post Thumbnail'), 'post_thumbnail_meta_box', $post_type, 'side', 'low');
</span><ins>+
</ins><span class="cx"> if ( post_type_supports($post_type, 'excerpts') )
</span><span class="cx"> add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', $post_type, 'normal', 'core');
</span><ins>+
</ins><span class="cx"> if ( post_type_supports($post_type, 'trackbacks') )
</span><span class="cx"> add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', $post_type, 'normal', 'core');
</span><ins>+
</ins><span class="cx"> if ( post_type_supports($post_type, 'custom-fields') )
</span><span class="cx"> add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', $post_type, 'normal', 'core');
</span><ins>+
</ins><span class="cx"> do_action('dbx_post_advanced');
</span><span class="cx"> if ( post_type_supports($post_type, 'comments') )
</span><span class="cx"> add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', $post_type, 'normal', 'core');
</span><span class="lines">@@ -115,23 +129,22 @@
</span><span class="cx"> add_meta_box('commentsdiv', __('Comments'), 'post_comment_meta_box', $post_type, 'normal', 'core');
</span><span class="cx">
</span><span class="cx"> if ( !( 'pending' == $post->post_status && !current_user_can( 'publish_posts' ) ) )
</span><del>- add_meta_box('slugdiv', __('Post Slug'), 'post_slug_meta_box', $post_type, 'normal', 'core');
</del><ins>+ add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', $post_type, 'normal', 'core');
</ins><span class="cx">
</span><span class="cx"> $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
</span><span class="cx"> if ( $post->post_author && !in_array($post->post_author, $authors) )
</span><span class="cx"> $authors[] = $post->post_author;
</span><span class="cx"> if ( $authors && count( $authors ) > 1 )
</span><del>- add_meta_box('authordiv', __('Post Author'), 'post_author_meta_box', $post_type, 'normal', 'core');
</del><ins>+ add_meta_box('authordiv', __('Author'), 'post_author_meta_box', $post_type, 'normal', 'core');
</ins><span class="cx">
</span><span class="cx"> if ( 0 < $post_ID && wp_get_post_revisions( $post_ID ) )
</span><del>- add_meta_box('revisionsdiv', __('Post Revisions'), 'post_revisions_meta_box', $post_type, 'normal', 'core');
</del><ins>+ add_meta_box('revisionsdiv', __('Revisions'), 'post_revisions_meta_box', $post_type, 'normal', 'core');
</ins><span class="cx">
</span><span class="cx"> do_action('do_meta_boxes', $post_type, 'normal', $post);
</span><span class="cx"> do_action('do_meta_boxes', $post_type, 'advanced', $post);
</span><span class="cx"> do_action('do_meta_boxes', $post_type, 'side', $post);
</span><span class="cx">
</span><span class="cx"> require_once('admin-header.php');
</span><del>-
</del><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="lines">@@ -143,16 +156,8 @@
</span><span class="cx"> <?php if ( $message ) : ?>
</span><span class="cx"> <div id="message" class="updated"><p><?php echo $message; ?></p></div>
</span><span class="cx"> <?php endif; ?>
</span><del>-<form name="post" action="post.php" method="post" id="post">
-<?php
-
-if ( 0 == $post_ID)
- wp_nonce_field('add-post');
-else
- wp_nonce_field('update-post_' . $post_ID);
-
-?>
-
</del><ins>+<form name="post" action="<?php echo $form_post; ?>" method="post" id="post">
+<?php wp_nonce_field($nonce_action); ?>
</ins><span class="cx"> <input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $user_ID ?>" />
</span><span class="cx"> <input type="hidden" id="hiddenaction" name="action" value="<?php echo esc_attr($form_action) ?>" />
</span><span class="cx"> <input type="hidden" id="originalaction" name="originalaction" value="<?php echo esc_attr($form_action) ?>" />
</span><span class="lines">@@ -169,9 +174,10 @@
</span><span class="cx"> <div id="poststuff" class="metabox-holder<?php echo 2 == $screen_layout_columns ? ' has-right-sidebar' : ''; ?>">
</span><span class="cx"> <div id="side-info-column" class="inner-sidebar">
</span><span class="cx">
</span><del>-<?php do_action('submitpost_box'); ?>
-
-<?php $side_meta_boxes = do_meta_boxes($post_type, 'side', $post); ?>
</del><ins>+<?php
+('page' == $post_type) ? do_action('submitpage_box') : do_action('submitpost_box');
+$side_meta_boxes = do_meta_boxes($post_type, 'side', $post);
+?>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="post-body">
</span><span class="lines">@@ -184,7 +190,7 @@
</span><span class="cx"> <div class="inside">
</span><span class="cx"> <?php
</span><span class="cx"> $sample_permalink_html = get_sample_permalink_html($post->ID);
</span><del>-if ( !( 'pending' == $post->post_status && !current_user_can( 'publish_posts' ) ) ) { ?>
</del><ins>+if ( !( 'pending' == $post->post_status && !current_user_can( 'publish_' . $post_type_cap . 's' ) ) ) { ?>
</ins><span class="cx"> <div id="edit-slug-box">
</span><span class="cx"> <?php
</span><span class="cx"> if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
</span><span class="lines">@@ -230,7 +236,7 @@
</span><span class="cx">
</span><span class="cx"> do_meta_boxes($post_type, 'normal', $post);
</span><span class="cx">
</span><del>-do_action('edit_form_advanced');
</del><ins>+( 'page' == $post_type ) ? do_action('edit_page_form') : do_action('edit_form_advanced');
</ins><span class="cx">
</span><span class="cx"> do_meta_boxes($post_type, 'advanced', $post);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmineditpageformphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-admin/edit-page-form.php (12694 => 12695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-page-form.php 2010-01-11 19:27:44 UTC (rev 12694)
+++ trunk/wp-admin/edit-page-form.php 2010-01-11 21:42:45 UTC (rev 12695)
</span><span class="lines">@@ -1,211 +0,0 @@
</span><del>-<?php
-/**
- * Edit page form for inclusion in the administration panels.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-// don't load directly
-if ( !defined('ABSPATH') )
- die('-1');
-
-/**
- * Post ID global.
- * @name $post_ID
- * @var int
- */
-if ( ! isset( $post_ID ) )
- $post_ID = 0;
-if ( ! isset( $temp_ID ) )
- $temp_ID = 0;
-
-$message = false;
-if ( isset($_GET['message']) ) {
- $_GET['message'] = absint( $_GET['message'] );
-
- switch ( $_GET['message'] ) {
- case 1:
- $message = sprintf( __('Page updated. <a href="%s">View page</a>'), get_permalink($post_ID) );
- break;
- case 2:
- $message = __('Custom field updated.');
- break;
- case 3:
- $message = __('Custom field deleted.');
- break;
- case 4:
- $message = sprintf( __('Page published. <a href="%s">View page</a>'), get_permalink($post_ID) );
- break;
- case 5:
- if ( isset($_GET['revision']) )
- $message = sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) );
- break;
- case 6:
- $message = sprintf( __('Page submitted. <a target="_blank" href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) );
- break;
- case 7:
- // translators: Publish box date formt, see http://php.net/date - Same as in meta-boxes.php
- $message = 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) );
- break;
- case 8:
- $message = sprintf( __('Page draft updated. <a target="_blank" href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) );
- break;
- }
-}
-
-$notice = false;
-if ( 0 == $post_ID) {
- $form_action = 'post';
- $nonce_action = 'add-page';
- $temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post()
- $form_extra = "<input type='hidden' id='post_ID' name='temp_ID' value='$temp_ID' />";
-} else {
- $post_ID = (int) $post_ID;
- $form_action = 'editpost';
- $nonce_action = 'update-page_' . $post_ID;
- $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
- $autosave = wp_get_post_autosave( $post_ID );
- if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) )
- $notice = sprintf( __( 'There is an autosave of this page that is more recent than the version below. <a href="%s">View the autosave</a>.' ), get_edit_post_link( $autosave->ID ) );
-}
-
-$temp_ID = (int) $temp_ID;
-$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');
-
-// all tag-style page taxonomies
-foreach ( get_object_taxonomies('page') as $tax_name ) {
- if ( !is_taxonomy_hierarchical($tax_name) ) {
- $taxonomy = get_taxonomy($tax_name);
- $label = isset($taxonomy->label) ? esc_attr($taxonomy->label) : $tax_name;
-
- add_meta_box('tagsdiv-' . $tax_name, $label, 'post_tags_meta_box', $post_type, 'side', 'core');
- }
-}
-
-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', $post_type, 'normal', 'core');
-
-if ( 0 < $post_ID && wp_get_post_revisions( $post_ID ) )
- add_meta_box('revisionsdiv', __('Page Revisions'), 'post_revisions_meta_box', $post_type, 'normal', 'core');
-
-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');
-?>
-
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
-
-<form name="post" action="page.php" method="post" id="post">
-<?php if ( $notice ) : ?>
-<div id="notice" class="error"><p><?php echo $notice ?></p></div>
-<?php endif; ?>
-<?php if ( $message ) : ?>
-<div id="message" class="updated"><p><?php echo $message; ?></p></div>
-<?php endif; ?>
-
-<?php wp_nonce_field($nonce_action); ?>
-
-<input type="hidden" id="user-id" name="user_ID" value="<?php echo $user_ID ?>" />
-<input type="hidden" id="hiddenaction" name="action" value='<?php echo esc_attr($form_action) ?>' />
-<input type="hidden" id="originalaction" name="originalaction" value="<?php echo esc_attr($form_action) ?>" />
-<input type="hidden" id="post_author" name="post_author" value="<?php echo esc_attr( $post->post_author ); ?>" />
-<?php echo $form_extra ?>
-<input type="hidden" id="post_type" name="post_type" value="<?php echo esc_attr($post->post_type) ?>" />
-<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo esc_attr($post->post_status) ?>" />
-<input name="referredby" type="hidden" id="referredby" value="<?php echo esc_url(stripslashes(wp_get_referer())); ?>" />
-<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
-
-<div id="poststuff" class="metabox-holder<?php echo 2 == $screen_layout_columns ? ' has-right-sidebar' : ''; ?>">
-
-<div id="side-info-column" class="inner-sidebar">
-<?php
-do_action('submitpage_box');
-$side_meta_boxes = do_meta_boxes($post_type, 'side', $post); ?>
-</div>
-
-<div id="post-body">
-<div id="post-body-content">
-<div id="titlediv">
-<div id="titlewrap">
- <label class="screen-reader-text" for="title"><?php _e('Title') ?></label>
- <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo esc_attr( htmlspecialchars( $post->post_title ) ); ?>" id="title" autocomplete="off" />
-</div>
-<div class="inside">
-<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
- <div id="edit-slug-box">
-<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
- echo $sample_permalink_html;
-endif; ?>
- </div>
-</div>
-</div>
-
-<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
-
-<?php the_editor($post->post_content); ?>
-<table id="post-status-info" cellspacing="0"><tbody><tr>
- <td id="wp-word-count"></td>
- <td class="autosave-info">
- <span id="autosave">&nbsp;</span>
-
-<?php
- if ($post_ID) {
- if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
- $last_user = get_userdata($last_id);
- printf(__('Last edited by %1$s on %2$s at %3$s'), esc_html( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
- } else {
- printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
- }
- }
-?>
- </td>
-</tr></tbody></table>
-
-<?php
-wp_nonce_field( 'autosave', 'autosavenonce', false );
-wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
-wp_nonce_field( 'getpermalink', 'getpermalinknonce', false );
-wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false );
-wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
-</div>
-
-<?php
-do_meta_boxes($post_type, 'normal', $post);
-do_action('edit_page_form');
-do_meta_boxes($post_type, 'advanced', $post);
-?>
-
-</div>
-</div>
-</div>
-
-</form>
-</div>
-
-<script type="text/javascript">
-try{document.post.title.focus();}catch(e){}
-</script>
</del></span></pre></div>
<a id="trunkwpadminpagenewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/page-new.php (12694 => 12695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/page-new.php 2010-01-11 19:27:44 UTC (rev 12694)
+++ trunk/wp-admin/page-new.php 2010-01-11 21:42:45 UTC (rev 12695)
</span><span class="lines">@@ -8,6 +8,9 @@
</span><span class="cx">
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('admin.php');
</span><ins>+
+$post_type = 'page';
+
</ins><span class="cx"> $title = __('Add New Page');
</span><span class="cx"> $parent_file = 'edit-pages.php';
</span><span class="cx"> $editing = true;
</span><span class="lines">@@ -23,7 +26,7 @@
</span><span class="cx"> $action = 'post';
</span><span class="cx"> $post = get_default_page_to_edit();
</span><span class="cx">
</span><del>- include('edit-page-form.php');
</del><ins>+ include('edit-form-advanced.php');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> include('admin-footer.php');
</span></span></pre></div>
<a id="trunkwpadminpagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/page.php (12694 => 12695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/page.php 2010-01-11 19:27:44 UTC (rev 12694)
+++ trunk/wp-admin/page.php 2010-01-11 21:42:45 UTC (rev 12695)
</span><span class="lines">@@ -122,7 +122,8 @@
</span><span class="cx"> wp_enqueue_script('autosave');
</span><span class="cx"> }
</span><span class="cx">
</span><del>- include('edit-page-form.php');
</del><ins>+ $post_type = $post->post_type;
+ include('edit-form-advanced.php');
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'editattachment':
</span></span></pre>
</div>
</div>
</body>
</html>