X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/4f9d63e13cd8c6e275797c75b401b074b82937bc..96bc8e88cf39086a9e0a883b8e2c311fe82a5e97:/wp-admin/post-new.php

diff --git a/wp-admin/post-new.php b/wp-admin/post-new.php
index 93c4ffbc..a5d74e8b 100644
--- a/wp-admin/post-new.php
+++ b/wp-admin/post-new.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * New Post Administration Panel.
+ * New Post Administration Screen.
  *
  * @package WordPress
  * @subpackage Administration
@@ -16,41 +16,34 @@ elseif ( in_array( $_GET['post_type'], get_post_types( array('show_ui' => true )
 else
 	wp_die( __('Invalid post type') );
 
-if ( 'post' != $post_type ) {
-	$parent_file = "edit.php?post_type=$post_type";
-	$submenu_file = "post-new.php?post_type=$post_type";
-} else {
+$post_type_object = get_post_type_object( $post_type );
+
+if ( 'post' == $post_type ) {
 	$parent_file = 'edit.php';
 	$submenu_file = 'post-new.php';
+} else {
+	$submenu_file = "post-new.php?post_type=$post_type";
+	if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
+		$parent_file = $post_type_object->show_in_menu;
+		if ( ! isset( $_registered_pages[ get_plugin_page_hookname( "post-new.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) )
+			$submenu_file = $parent_file;
+	} else {
+		$parent_file = "edit.php?post_type=$post_type";
+	}
 }
 
-$post_type_object = get_post_type_object($post_type);
-
 $title = $post_type_object->labels->add_new_item;
 
 $editing = true;
 
-if ( 'post' == $post_type && !current_user_can('edit_posts') ) {
-	include('./admin-header.php'); ?>
-<div class="wrap">
-<p><?php printf(__('Since you&#8217;re a newcomer, you&#8217;ll have to wait for an admin to add the <code>edit_posts</code> capability to your user, in order to be authorized to post.<br />
-You can also <a href="mailto:%s?subject=Promotion?">e-mail the admin</a> to ask for a promotion.<br />
-When you&#8217;re promoted, just reload this page and you&#8217;ll be able to blog. :)'), get_option('admin_email')); ?>
-</p>
-</div>
-<?php
-	include('./admin-footer.php');
-	exit();
-}
+if ( ! current_user_can( $post_type_object->cap->edit_posts ) )
+	wp_die( __( 'Cheatin&#8217; uh?' ) );
 
 wp_enqueue_script('autosave');
 
 // Show post form.
-if ( current_user_can($post_type_object->cap->edit_posts) ) {
-	$post = get_default_post_to_edit( $post_type, true );
-	$post_ID = $post->ID;
-	include('edit-form-advanced.php');
-}
-
+$post = get_default_post_to_edit( $post_type, true );
+$post_ID = $post->ID;
+include('edit-form-advanced.php');
 include('./admin-footer.php');
-?>
\ No newline at end of file
+?>