WordPress 4.0

[autoinstalls/wordpress.git] / wp-admin / post-new.php

diff --git a/wp-admin/post-new.php b/wp-admin/post-new.php
index 4d7df63c94107788d467cf511190dbd7855470c3..bfdffaf3a3534faeaa1454f7c3949dcf28ff6490 100644 (file)
--- a/wp-admin/post-new.php
+++ b/wp-admin/post-new.php
@@ -7,7 +7,7 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );
 
 if ( !isset($_GET['post_type']) )
        $post_type = 'post';
@@ -22,14 +22,22 @@ if ( 'post' == $post_type ) {
        $parent_file = 'edit.php';
        $submenu_file = 'post-new.php';
 } elseif ( 'attachment' == $post_type ) {
-       wp_redirect( admin_url( 'media-new.php' ) );
-       exit;
+       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;
-               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;
+               // 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";
        }
@@ -62,5 +70,5 @@ if ( is_multisite() ) {
 // Show post form.
 $post = get_default_post_to_edit( $post_type, true );
 $post_ID = $post->ID;
-include('edit-form-advanced.php');
-include('./admin-footer.php');
+include( ABSPATH . 'wp-admin/edit-form-advanced.php' );
+include( ABSPATH . 'wp-admin/admin-footer.php' );