--- a/web/wp-admin/post.php	Wed Dec 19 12:35:13 2012 -0800
+++ b/web/wp-admin/post.php	Wed Dec 19 17:46:52 2012 -0800
@@ -85,8 +85,12 @@
 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 @@
 		$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 @@
 		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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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.') );