Ticket #18235: 18235.patch

wp-admin/edit-form-advanced.php

@@ -23 +23 @@
  * @var int
  */
 $post_ID = isset($post_ID) ? (int) $post_ID : 0;
+
+// redundant code
 $temp_ID = isset($temp_ID) ? (int) $temp_ID : 0;
+// end redundant code
+
 $user_ID = isset($user_ID) ? (int) $user_ID : 0;
 $action = isset($action) ? $action : '';
 

wp-admin/includes/post.php

@@ -234 +234 @@
 
         wp_update_post( $post_data );
 
+// redundant code       
         // Reunite any orphaned attachments with their parent
         if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) )
                 $draft_ids = array();
@@ -242 +243 @@
 
         // Now that we have an ID we can fix any attachment anchor hrefs
         _fix_attachment_links( $post_ID );
+// end redundant code
 
         wp_set_post_lock( $post_ID, $GLOBALS['current_user']->ID );
 
@@ -551 +553 @@
         // Clear out any data in internal vars.
         unset( $_POST['filter'] );
 
+
+// redundant code
         // Check for autosave collisions
         // Does this need to be updated? ~ Mark
         $temp_id = false;
@@ -569 +573 @@
                         return edit_post();
                 }
         }
+// end redundant code
 
+
         // Edit don't write if we have a post id.
         if ( isset( $_POST['ID'] ) ) {
                 $_POST['post_ID'] = $_POST['ID'];
@@ -611 +617 @@
 
         add_post_meta( $post_ID, '_edit_last', $GLOBALS['current_user']->ID );
 
+
+// redundant code
         // Reunite any orphaned attachments with their parent
         // Does this need to be udpated? ~ Mark
         if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) )
@@ -628 +636 @@
 
         // Now that we have an ID we can fix any attachment anchor hrefs
         _fix_attachment_links( $post_ID );
+// end redundant code
 
+
         wp_set_post_lock( $post_ID, $GLOBALS['current_user']->ID );
 
         return $post_ID;
@@ -809 +819 @@
 // Private
 //
 
+
+// redundant code: we have had $post_ID always set for quite some time now. Time to remove these back-compat?
 /**
  * Replace hrefs of attachment anchors with up-to-date permalinks.
  *
@@ -891 +903 @@
                 delete_post_meta($child_id, '_wp_attachment_temp_parent');
         }
 }
+// end redundant code
 
+
+
 /**
  * Get all the possible statuses for a post_type
  *

wp-includes/post.php

@@ -3727 +3727 @@
 
         clean_post_cache($post_ID);
 
+
+// redundant code
         if ( isset($post_parent) && $post_parent < 0 )
                 add_post_meta($post_ID, '_wp_attachment_temp_parent', $post_parent, true);
+// end redundant code
 
+
         if ( ! empty( $context ) )
                 add_post_meta( $post_ID, '_wp_attachment_context', $context, true );