X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8f374b7233bc2815ccc387e448d208c5434eb961..61343b82c4f0da4c68e4c6373daafff4a81efdd1:/wp-admin/post.php

diff --git a/wp-admin/post.php b/wp-admin/post.php
index 035a1855..eab89e6b 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -14,7 +14,7 @@ require_once('./admin.php');
 $parent_file = 'edit.php';
 $submenu_file = 'edit.php';
 
-wp_reset_vars(array('action', 'safe_mode', 'withcomments', 'posts', 'content', 'edited_post_title', 'comment_error', 'profile', 'trackback_url', 'excerpt', 'showcomments', 'commentstart', 'commentend', 'commentorder'));
+wp_reset_vars( array( 'action' ) );
 
 if ( isset( $_GET['post'] ) )
  	$post_id = $post_ID = (int) $_GET['post'];
@@ -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 );
 }
@@ -129,25 +133,33 @@ case 'edit':
 		exit();
 	}
 
-	$p = $post_id;
-
-	if ( empty($post->ID) )
-		wp_die( __('You attempted to edit an item that doesn’t exist. Perhaps it was deleted?') );
+	if ( ! $post )
+		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
 
-	if ( null == $post_type_object )
-		wp_die( __('Unknown post type.') );
+	if ( ! $post_type_object )
+		wp_die( __( 'Unknown post type.' ) );
 
-	if ( !current_user_can($post_type_object->cap->edit_post, $post_id) )
-		wp_die( __('You are not allowed to edit this item.') );
+	if ( ! current_user_can( 'edit_post', $post_id ) )
+		wp_die( __( 'You are not allowed to edit this item.' ) );
 
 	if ( 'trash' == $post->post_status )
-		wp_die( __('You can’t edit this item because it is in the Trash. Please restore it and try again.') );
+		wp_die( __( 'You can’t edit this item because it is in the Trash. Please restore it and try again.' ) );
+
+	if ( ! empty( $_GET['get-post-lock'] ) ) {
+		wp_set_post_lock( $post_id );
+		wp_redirect( get_edit_post_link( $post_id, 'url' ) );
+		exit();
+	}
 
 	$post_type = $post->post_type;
 	if ( 'post' == $post_type ) {
 		$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;
@@ -157,15 +169,26 @@ case 'edit':
 		$post_new_file = "post-new.php?post_type=$post_type";
 	}
 
-	if ( $last = wp_check_post_lock( $post->ID ) ) {
-		add_action('admin_notices', '_admin_notice_post_locked' );
-	} else {
+	if ( ! wp_check_post_lock( $post->ID ) ) {
 		$active_post_lock = wp_set_post_lock( $post->ID );
-		wp_enqueue_script('autosave');
+
+		if ( 'attachment' !== $post_type )
+			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 );
 	}
 
 	$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 +200,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,57 +213,82 @@ 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();
 
+	// Session cookie flag that the post was saved
+	if ( isset( $_COOKIE['wp-saving-post-' . $post_id] ) )
+		setcookie( 'wp-saving-post-' . $post_id, 'saved' );
+
 	redirect_post($post_id); // Send user on their way while we keep working
 
 	exit();
 	break;
 
 case 'trash':
-	check_admin_referer('trash-' . $post_type . '_' . $post_id);
+	check_admin_referer('trash-post_' . $post_id);
+
+	if ( ! $post )
+		wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
+
+	if ( ! $post_type_object )
+		wp_die( __( 'Unknown post type.' ) );
 
-	$post = & get_post($post_id);
+	if ( ! current_user_can( 'delete_post', $post_id ) )
+		wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
 
-	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.') );
+	if ( $user_id = wp_check_post_lock( $post_id ) ) {
+		$user = get_userdata( $user_id );
+		wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
+	}
 
-	if ( ! wp_trash_post($post_id) )
-		wp_die( __('Error in moving to Trash.') );
+	if ( ! wp_trash_post( $post_id ) )
+		wp_die( __( 'Error in moving to Trash.' ) );
 
 	wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
 	exit();
 	break;
 
 case 'untrash':
-	check_admin_referer('untrash-' . $post_type . '_' . $post_id);
+	check_admin_referer('untrash-post_' . $post_id);
+
+	if ( ! $post )
+		wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
+
+	if ( ! $post_type_object )
+		wp_die( __( 'Unknown post type.' ) );
 
-	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.') );
+	if ( ! current_user_can( 'delete_post', $post_id ) )
+		wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
 
-	if ( ! wp_untrash_post($post_id) )
-		wp_die( __('Error in restoring from Trash.') );
+	if ( ! wp_untrash_post( $post_id ) )
+		wp_die( __( 'Error in restoring from Trash.' ) );
 
 	wp_redirect( add_query_arg('untrashed', 1, $sendback) );
 	exit();
 	break;
 
 case 'delete':
-	check_admin_referer('delete-' . $post_type . '_' . $post_id);
+	check_admin_referer('delete-post_' . $post_id);
+
+	if ( ! $post )
+		wp_die( __( 'This item has already been deleted.' ) );
+
+	if ( ! $post_type_object )
+		wp_die( __( 'Unknown post type.' ) );
 
-	if ( !current_user_can($post_type_object->cap->delete_post, $post_id) )
-		wp_die( __('You are not allowed to delete this item.') );
+	if ( ! current_user_can( 'delete_post', $post_id ) )
+		wp_die( __( 'You are not allowed to delete this item.' ) );
 
-	$force = !EMPTY_TRASH_DAYS;
+	$force = ! EMPTY_TRASH_DAYS;
 	if ( $post->post_type == 'attachment' ) {
-		$force = ( $force || !MEDIA_TRASH );
-		if ( ! wp_delete_attachment($post_id, $force) )
-			wp_die( __('Error in deleting.') );
+		$force = ( $force || ! MEDIA_TRASH );
+		if ( ! wp_delete_attachment( $post_id, $force ) )
+			wp_die( __( 'Error in deleting.' ) );
 	} else {
-		if ( !wp_delete_post($post_id, $force) )
-			wp_die( __('Error in deleting.') );
+		if ( ! wp_delete_post( $post_id, $force ) )
+			wp_die( __( 'Error in deleting.' ) );
 	}
 
 	wp_redirect( add_query_arg('deleted', 1, $sendback) );