X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/76aea3697c6043c1613370f172395b4f65ee71f0..refs/tags/wordpress-2.9:/wp-admin/post.php
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 0dfb8212..a8ccddae 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -1,4 +1,14 @@
ID) ) wp_die( __("You attempted to edit a post that doesn't exist. Perhaps it was deleted?") );
+ if ( empty($post->ID) )
+ wp_die( __('You attempted to edit a post that doesn’t exist. Perhaps it was deleted?') );
+
+ if ( !current_user_can('edit_post', $post_ID) )
+ wp_die( __('You are not allowed to edit this post.') );
+
+ if ( 'trash' == $post->post_status )
+ wp_die( __('You can’t edit this post because it is in the Trash. Please restore it and try again.') );
if ( 'post' != $post->post_type ) {
wp_redirect( get_edit_post_link( $post->ID, 'url' ) );
@@ -89,25 +147,17 @@ case 'edit':
add_thickbox();
wp_enqueue_script('media-upload');
wp_enqueue_script('word-count');
+ wp_enqueue_script( 'admin-comments' );
+ enqueue_comment_hotkeys_js();
- if ( current_user_can('edit_post', $post_ID) ) {
- if ( $last = wp_check_post_lock( $post->ID ) ) {
- $last_user = get_userdata( $last );
- $last_user_name = $last_user ? $last_user->display_name : __('Somebody');
- $message = sprintf( __( 'Warning: %s is currently editing this post' ), wp_specialchars( $last_user_name ) );
- $message = str_replace( "'", "\'", "
" );
- add_action('admin_notices', create_function( '', "echo '$message';" ) );
- } else {
- wp_set_post_lock( $post->ID );
- wp_enqueue_script('autosave');
- }
+ if ( $last = wp_check_post_lock( $post->ID ) ) {
+ add_action('admin_notices', '_admin_notice_post_locked' );
+ } else {
+ wp_set_post_lock( $post->ID );
+ wp_enqueue_script('autosave');
}
- require_once('admin-header.php');
-
- if ( !current_user_can('edit_post', $post_ID) )
- die ( __('You are not allowed to edit this post.') );
-
+ $title = __('Edit Post');
$post = get_post_to_edit($post_ID);
include('edit-form-advanced.php');
@@ -140,6 +190,38 @@ case 'editpost':
exit();
break;
+case 'trash':
+ $post_id = isset($_GET['post']) ? intval($_GET['post']) : intval($_POST['post_ID']);
+ check_admin_referer('trash-post_' . $post_id);
+
+ $post = & get_post($post_id);
+
+ if ( !current_user_can('delete_post', $post_id) )
+ wp_die( __('You are not allowed to move this post to the 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':
+ $post_id = isset($_GET['post']) ? intval($_GET['post']) : intval($_POST['post_ID']);
+ check_admin_referer('untrash-post_' . $post_id);
+
+ $post = & get_post($post_id);
+
+ if ( !current_user_can('delete_post', $post_id) )
+ wp_die( __('You are not allowed to move this post out of the 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':
$post_id = (isset($_GET['post'])) ? intval($_GET['post']) : intval($_POST['post_ID']);
check_admin_referer('delete-post_' . $post_id);
@@ -149,19 +231,26 @@ case 'delete':
if ( !current_user_can('delete_post', $post_id) )
wp_die( __('You are not allowed to delete this post.') );
+ $force = !EMPTY_TRASH_DAYS;
if ( $post->post_type == 'attachment' ) {
- if ( ! wp_delete_attachment($post_id) )
+ $force = ( $force || !MEDIA_TRASH );
+ if ( ! wp_delete_attachment($post_id, $force) )
wp_die( __('Error in deleting...') );
} else {
- if ( !wp_delete_post($post_id) )
+ if ( !wp_delete_post($post_id, $force) )
wp_die( __('Error in deleting...') );
}
- $sendback = wp_get_referer();
- if (strpos($sendback, 'post.php') !== false) $sendback = admin_url('post-new.php');
- elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php');
- $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
- wp_redirect($sendback);
+ wp_redirect( add_query_arg('deleted', 1, $sendback) );
+ exit();
+ break;
+
+case 'preview':
+ check_admin_referer( 'autosave', 'autosavenonce' );
+
+ $url = post_preview();
+
+ wp_redirect($url);
exit();
break;