Wordpress 3.5

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

diff --git a/wp-admin/post.php b/wp-admin/post.php
index 035a185540a119ad5afef3e5d40a3c2797a27294..c638c18d397efcda5260819d243bd977dd748f24 100644 (file)
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -85,8 +85,12 @@ $sendback = wp_get_referer();
 if ( ! $sendback ||
      strpos( $sendback, 'post.php' ) !== false ||
      strpos( $sendback, 'post-new.php' ) !== false ) {
-       $sendback = admin_url( 'edit.php' );
-       $sendback .= ( ! empty( $post_type ) ) ? '?post_type=' . $post_type : '';
+       if ( 'attachment' == $post_type ) {
+               $sendback = admin_url( 'upload.php' );
+       } else {
+               $sendback = admin_url( 'edit.php' );
+               $sendback .= ( ! empty( $post_type ) ) ? '?post_type=' . $post_type : '';
+       }
 } else {
        $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback );
 }
@@ -148,6 +152,10 @@ case 'edit':
                $parent_file = "edit.php";
                $submenu_file = "edit.php";
                $post_new_file = "post-new.php";
+       } elseif ( 'attachment' == $post_type ) {
+               $parent_file = 'upload.php';
+               $submenu_file = 'upload.php';
+               $post_new_file = 'media-new.php';
        } else {
                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;
@@ -161,11 +169,13 @@ case 'edit':
                add_action('admin_notices', '_admin_notice_post_locked' );
        } else {
                $active_post_lock = wp_set_post_lock( $post->ID );
-               wp_enqueue_script('autosave');
+
+               if ( 'attachment' !== $post_type )
+                       wp_enqueue_script('autosave');
        }
 
        $title = $post_type_object->labels->edit_item;
-       $post = get_post_to_edit($post_id);
+       $post = get_post($post_id, OBJECT, 'edit');
 
        if ( post_type_supports($post_type, 'comments') ) {
                wp_enqueue_script('admin-comments');
@@ -177,7 +187,7 @@ case 'edit':
        break;
 
 case 'editattachment':
-       check_admin_referer('update-attachment_' . $post_id);
+       check_admin_referer('update-post_' . $post_id);
 
        // Don't let these be changed
        unset($_POST['guid']);
@@ -190,7 +200,7 @@ case 'editattachment':
        wp_update_attachment_metadata( $post_id, $newmeta );
 
 case 'editpost':
-       check_admin_referer('update-' . $post_type . '_' . $post_id);
+       check_admin_referer('update-post_' . $post_id);
 
        $post_id = edit_post();
 
@@ -200,9 +210,9 @@ case 'editpost':
        break;
 
 case 'trash':
-       check_admin_referer('trash-' . $post_type . '_' . $post_id);
+       check_admin_referer('trash-post_' . $post_id);
 
-       $post = & get_post($post_id);
+       $post = get_post($post_id);
 
        if ( !current_user_can($post_type_object->cap->delete_post, $post_id) )
                wp_die( __('You are not allowed to move this item to the Trash.') );
@@ -215,7 +225,7 @@ case 'trash':
        break;
 
 case 'untrash':
-       check_admin_referer('untrash-' . $post_type . '_' . $post_id);
+       check_admin_referer('untrash-post_' . $post_id);
 
        if ( !current_user_can($post_type_object->cap->delete_post, $post_id) )
                wp_die( __('You are not allowed to move this item out of the Trash.') );
@@ -228,7 +238,7 @@ case 'untrash':
        break;
 
 case 'delete':
-       check_admin_referer('delete-' . $post_type . '_' . $post_id);
+       check_admin_referer('delete-post_' . $post_id);
 
        if ( !current_user_can($post_type_object->cap->delete_post, $post_id) )
                wp_die( __('You are not allowed to delete this item.') );