X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/d3b1ea255664edd2deef17f900a655613d20820d..refs/tags/wordpress-2.9:/wp-admin/post.php diff --git a/wp-admin/post.php b/wp-admin/post.php index 008778fa..a8ccddae 100644 --- a/wp-admin/post.php +++ b/wp-admin/post.php @@ -31,39 +31,45 @@ function redirect_post($post_ID = '') { } $referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer()); - if ( !empty($_POST['mode']) && 'bookmarklet' == $_POST['mode'] ) { - $location = $_POST['referredby']; - } elseif ( !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) { + if ( !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) { if ( isset($_POST['saveasdraft']) ) $location = 'sidebar.php?a=c'; elseif ( isset($_POST['publish']) ) $location = 'sidebar.php?a=b'; - } elseif ( ( isset($_POST['save']) || isset($_POST['publish']) ) ) { + } elseif ( isset($_POST['save']) || isset($_POST['publish']) ) { + $status = get_post_status( $post_ID ); + if ( isset( $_POST['publish'] ) ) { - if ( 'pending' == get_post_status( $post_ID ) ) - $location = add_query_arg( 'message', 8, get_edit_post_link( $post_ID, 'url' ) ); - else - $location = add_query_arg( 'message', 6, get_edit_post_link( $post_ID, 'url' ) ); + switch ( $status ) { + case 'pending': + $message = 8; + break; + case 'future': + $message = 9; + break; + default: + $message = 6; + } } else { - $location = add_query_arg( 'message', 1, get_edit_post_link( $post_ID, 'url' ) ); + $message = 'draft' == $status ? 10 : 1; } - } elseif (isset($_POST['addmeta']) && $_POST['addmeta']) { + + $location = add_query_arg( 'message', $message, get_edit_post_link( $post_ID, 'url' ) ); + } elseif ( isset($_POST['addmeta']) && $_POST['addmeta'] ) { $location = add_query_arg( 'message', 2, wp_get_referer() ); $location = explode('#', $location); $location = $location[0] . '#postcustom'; - } elseif (isset($_POST['deletemeta']) && $_POST['deletemeta']) { + } elseif ( isset($_POST['deletemeta']) && $_POST['deletemeta'] ) { $location = add_query_arg( 'message', 3, wp_get_referer() ); $location = explode('#', $location); $location = $location[0] . '#postcustom'; - } elseif ($action == 'editattachment') { - $location = 'attachments.php'; } elseif ( 'post-quickpress-save-cont' == $_POST['action'] ) { $location = "post.php?action=edit&post=$post_ID&message=7"; } else { $location = add_query_arg( 'message', 4, get_edit_post_link( $post_ID, 'url' ) ); } - wp_redirect( $location ); + wp_redirect( apply_filters( 'redirect_post_location', $location, $post_ID ) ); } if ( isset( $_POST['deletepost'] ) ) @@ -71,6 +77,12 @@ if ( isset( $_POST['deletepost'] ) ) elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] ) $action = 'preview'; +$sendback = wp_get_referer(); +if ( strpos($sendback, 'post.php') !== false || strpos($sendback, 'post-new.php') !== false ) + $sendback = admin_url('edit.php'); +else + $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback ); + switch($action) { case 'postajaxpost': case 'post': @@ -115,7 +127,14 @@ case 'edit': $post_ID = $p = (int) $_GET['post']; $post = get_post($post_ID); - if ( empty($post->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' ) ); @@ -131,24 +150,14 @@ case 'edit': 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' ), esc_html( $last_user_name ) ); - $message = str_replace( "'", "\'", "
$message