Changes in trunk/wp-admin/post.php [17962:19272]

File:

• trunk/wp-admin/post.php (modified) (4 diffs)

trunk/wp-admin/post.php

@@ -17 +17 @@
 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 );
 }
 
@@ -95 +83 @@
 
 $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 );
@@ -115 +105 @@
         $_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 {
@@ -175 +161 @@
         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');
     }