X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..8f374b7233bc2815ccc387e448d208c5434eb961:/wp-admin/post.php diff --git a/wp-admin/post.php b/wp-admin/post.php index 5f04fa71..035a1855 100644 --- a/wp-admin/post.php +++ b/wp-admin/post.php @@ -9,77 +9,71 @@ */ /** WordPress Administration Bootstrap */ -require_once('admin.php'); +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')); +if ( isset( $_GET['post'] ) ) + $post_id = $post_ID = (int) $_GET['post']; +elseif ( isset( $_POST['post_ID'] ) ) + $post_id = $post_ID = (int) $_POST['post_ID']; +else + $post_id = $post_ID = 0; + +$post = $post_type = $post_type_object = null; + +if ( $post_id ) + $post = get_post( $post_id ); + +if ( $post ) { + $post_type = $post->post_type; + $post_type_object = get_post_type_object( $post_type ); +} + /** * Redirect to previous page. * - * @param int $post_ID Optional. Post ID. + * @param int $post_id Optional. Post ID. */ -function redirect_post($post_ID = '') { - global $action; - - $referredby = ''; - if ( !empty($_POST['referredby']) ) { - $referredby = preg_replace('|https?://[^/]+|i', '', $_POST['referredby']); - $referredby = remove_query_arg('_wp_original_http_referer', $referredby); - } - $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 ( isset($_POST['saveasdraft']) ) - $location = 'sidebar.php?a=c'; - elseif ( isset($_POST['publish']) ) - $location = 'sidebar.php?a=b'; - } elseif ( ( isset($_POST['save']) || isset($_POST['publish']) ) && ( empty($referredby) || $referredby == $referer || 'redo' != $referredby ) ) { - if ( isset($_POST['_wp_original_http_referer']) && strpos( $_POST['_wp_original_http_referer'], '/wp-admin/post.php') === false && strpos( $_POST['_wp_original_http_referer'], '/wp-admin/post-new.php') === false ) - $location = add_query_arg( array( - '_wp_original_http_referer' => urlencode( stripslashes( $_POST['_wp_original_http_referer'] ) ), - 'message' => 1 - ), get_edit_post_link( $post_ID, 'url' ) ); - else { - 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' ) ); - } else { - $location = add_query_arg( 'message', 7, get_edit_post_link( $post_ID, 'url' ) ); +function redirect_post($post_id = '') { + if ( isset($_POST['save']) || isset($_POST['publish']) ) { + $status = get_post_status( $post_id ); + + if ( isset( $_POST['publish'] ) ) { + switch ( $status ) { + case 'pending': + $message = 8; + break; + case 'future': + $message = 9; + break; + default: + $message = 6; } + } else { + $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 (!empty($referredby) && $referredby != $referer) { - $location = $_POST['referredby']; - $location = remove_query_arg('_wp_original_http_referer', $location); - if ( false !== strpos($location, 'edit.php') || false !== strpos($location, 'edit-post-drafts.php') ) - $location = add_query_arg('posted', $post_ID, $location); - elseif ( false !== strpos($location, 'wp-admin') ) - $location = "post-new.php?posted=$post_ID"; - } elseif ( isset($_POST['publish']) ) { - $location = "post-new.php?posted=$post_ID"; - } elseif ($action == 'editattachment') { - $location = 'attachments.php'; } elseif ( 'post-quickpress-save-cont' == $_POST['action'] ) { - $location = "post.php?action=edit&post=$post_ID&message=7"; + $location = "post.php?action=edit&post=$post_id&message=7"; } else { - $location = add_query_arg( 'message', 4, get_edit_post_link( $post_ID, 'url' ) ); + $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 ) ); + exit; } if ( isset( $_POST['deletepost'] ) ) @@ -87,12 +81,22 @@ if ( isset( $_POST['deletepost'] ) ) elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] ) $action = 'preview'; +$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 : ''; +} else { + $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback ); +} + switch($action) { case 'postajaxpost': case 'post': case 'post-quickpress-publish': case 'post-quickpress-save': - check_admin_referer('add-post'); + check_admin_referer('add-' . $post_type); if ( 'post-quickpress-publish' == $action ) $_POST['publish'] = 'publish'; // tell write_post() to publish @@ -100,80 +104,79 @@ case 'post-quickpress-save': if ( 'post-quickpress-publish' == $action || 'post-quickpress-save' == $action ) { $_POST['comment_status'] = get_option('default_comment_status'); $_POST['ping_status'] = get_option('default_ping_status'); - } - - if ( !empty( $_POST['quickpress_post_ID'] ) ) { - $_POST['post_ID'] = (int) $_POST['quickpress_post_ID']; - $post_ID = edit_post(); + $post_id = edit_post(); } else { - $post_ID = 'postajaxpost' == $action ? edit_post() : write_post(); + $post_id = 'postajaxpost' == $action ? edit_post() : write_post(); } if ( 0 === strpos( $action, 'post-quickpress' ) ) { - $_POST['post_ID'] = $post_ID; + $_POST['post_ID'] = $post_id; // output the quickpress dashboard widget require_once(ABSPATH . 'wp-admin/includes/dashboard.php'); wp_dashboard_quick_press(); exit; } - redirect_post($post_ID); + redirect_post($post_id); exit(); break; case 'edit': $editing = true; - if ( empty( $_GET['post'] ) ) { - wp_redirect("post.php"); + if ( empty( $post_id ) ) { + wp_redirect( admin_url('post.php') ); exit(); } - $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?") ); + $p = $post_id; - if ( 'post' != $post->post_type ) { - wp_redirect( get_edit_post_link( $post->ID, 'url' ) ); - exit(); - } + if ( empty($post->ID) ) + wp_die( __('You attempted to edit an item that doesn’t exist. Perhaps it was deleted?') ); - wp_enqueue_script('post'); - if ( user_can_richedit() ) - wp_enqueue_script('editor'); - 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( "'", "\'", "
$message