Changes in branches/3.1/wp-admin/includes/post.php [18023:18370]

File:

• branches/3.1/wp-admin/includes/post.php (modified) (6 diffs)

branches/3.1/wp-admin/includes/post.php

@@ -136 +136 @@
                 $post_data = &$_POST;
 
+        // Clear out any data in internal vars.
+        unset( $post_data['filter'] );
+
         $post_ID = (int) $post_data['post_ID'];
         $post = get_post( $post_ID );
@@ -342 +345 @@
                 }
 
-                $tax_names = get_object_taxonomies( get_post($post_ID) );
+                $post = get_post( $post_ID );
+                $tax_names = get_object_taxonomies( $post );
                 foreach ( $tax_names as $tax_name ) {
                         $taxonomy_obj = get_taxonomy($tax_name);
@@ -363 +367 @@
                         unset( $post_data['tax_input']['category'] );
                 }
+
+                $post_data['post_mime_type'] = $post->post_mime_type;
+                $post_data['guid'] = $post->guid;
 
                 $post_data['ID'] = $post_ID;
@@ -535 +542 @@
         $_POST['post_mime_type'] = '';
 
+        // Clear out any data in internal vars.
+        unset( $_POST['filter'] );
+
         // Check for autosave collisions
         // Does this need to be updated? ~ Mark
@@ -552 +562 @@
                         return edit_post();
                 }
+        }
+
+        // Edit don't write if we have a post id.
+        if ( isset( $_POST['ID'] ) ) {
+                $_POST['post_ID'] = $_POST['ID'];
+                unset ( $_POST['ID'] );
+        }
+        if ( isset( $_POST['post_ID'] ) ) {
+                return edit_post();
         }
 
@@ -998 +1017 @@
         $q['post_type'] = 'attachment';
         $post_type = get_post_type_object( 'attachment' );
-        $states = array( 'inherit' );
+        $states = 'inherit';
         if ( current_user_can( $post_type->cap->read_private_posts ) )
-                $states[] = 'private';
+                $states .= ',private';
 
         $q['post_status'] = isset( $q['status'] ) && 'trash' == $q['status'] ? 'trash' : $states;