X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/99a64b9fd0d5ebb21c33c3a0b5865e9c412b430c..5aa86a9053fb0fa15846bb60aac2fb8fdfff524a:/wp-admin/post.php

diff --git a/wp-admin/post.php b/wp-admin/post.php
index df9e5a52..c3bca702 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -16,33 +16,21 @@ $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 = (int) $_GET['post'];
-elseif ( isset($_POST['post_ID']) )
-	$post_id = (int) $_POST['post_ID'];
+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 = 0;
-$post_ID = $post_id;
-$post = null;
-$post_type_object = null;
-$post_type = null;
-if ( $post_id ) {
-	$post = get_post($post_id);
-	if ( $post ) {
-		$post_type_object = get_post_type_object($post->post_type);
-		if ( $post_type_object ) {
-			$post_type = $post->post_type;
-			$current_screen->post_type = $post->post_type;
-			$current_screen->id = $current_screen->post_type;
-		}
-	}
-} elseif ( isset($_POST['post_type']) ) {
-	$post_type_object = get_post_type_object($_POST['post_type']);
-	if ( $post_type_object ) {
-		$post_type = $post_type_object->name;
-		$current_screen->post_type = $post_type;
-		$current_screen->id = $current_screen->post_type;
-	}
+ 	$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 );
 }
 
 /**
@@ -94,9 +82,11 @@ 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');
-	$sendback .= ( !empty( $post_type ) ) ? '?post_type=' . $post_type : '';
+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 );
 }
@@ -114,10 +104,6 @@ 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();
 	} else {
 		$post_id = 'postajaxpost' == $action ? edit_post() : write_post();
@@ -174,7 +160,7 @@ case 'edit':
 	if ( $last = wp_check_post_lock( $post->ID ) ) {
 		add_action('admin_notices', '_admin_notice_post_locked' );
 	} else {
-		wp_set_post_lock( $post->ID );
+		$active_post_lock = wp_set_post_lock( $post->ID );
 		wp_enqueue_script('autosave');
 	}