X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..88550bc3400cc7c035ff590ecb007c7938041ded:/wp-admin/post-new.php

diff --git a/wp-admin/post-new.php b/wp-admin/post-new.php
index 93c4ffbc..d919d55c 100644
--- a/wp-admin/post-new.php
+++ b/wp-admin/post-new.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * New Post Administration Panel.
+ * New Post Administration Screen.
  *
  * @package WordPress
  * @subpackage Administration
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );
 
 if ( !isset($_GET['post_type']) )
 	$post_type = 'post';
@@ -16,41 +16,59 @@ 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';
+} elseif ( 'attachment' == $post_type ) {
+	if ( wp_redirect( admin_url( 'media-new.php' ) ) )
+		exit;
+} 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;
+		// What if there isn't a post-new.php item for this post type?
+		if ( ! isset( $_registered_pages[ get_plugin_page_hookname( "post-new.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) {
+			if (	isset( $_registered_pages[ get_plugin_page_hookname( "edit.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) {
+				// Fall back to edit.php for that post type, if it exists
+				$submenu_file = "edit.php?post_type=$post_type";
+			} else {
+				// Otherwise, give up and highlight the parent
+				$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 ) || ! current_user_can( $post_type_object->cap->create_posts ) )
+	wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
 
-wp_enqueue_script('autosave');
+// Schedule auto-draft cleanup
+if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) )
+	wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
 
-// 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');
+wp_enqueue_script( 'autosave' );
+
+if ( is_multisite() ) {
+	add_action( 'admin_footer', '_admin_notice_post_locked' );
+} else {
+	$check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
+
+	if ( count( $check_users ) > 1 )
+		add_action( 'admin_footer', '_admin_notice_post_locked' );
+
+	unset( $check_users );
 }
 
-include('./admin-footer.php');
-?>
\ No newline at end of file
+// Show post form.
+$post = get_default_post_to_edit( $post_type, true );
+$post_ID = $post->ID;
+include( ABSPATH . 'wp-admin/edit-form-advanced.php' );
+include( ABSPATH . 'wp-admin/admin-footer.php' );