Changeset 4884

Timestamp:

02/15/2007 01:03:06 AM (19 years ago)

Author:

markjaquith

Message:

Make sure attachments uploaded on unsaved drafts get reunited with their parent post. Props mdawaffe. fixes #3757

File:

• trunk/wp-admin/admin-functions.php (modified) (6 diffs)

trunk/wp-admin/admin-functions.php

@@ -23 +23 @@
 
         // Check for autosave collisions
+        $temp_id = false;
         if ( isset($_POST['temp_ID']) ) {
                 $temp_id = (int) $_POST['temp_ID'];
@@ -34 +35 @@
                         $_POST['post_ID'] = $draft_ids[$temp_id];
                         unset($_POST['temp_ID']);
-                        relocate_children( $temp_id, $_POST['post_ID'] );
                         update_user_option( $user_ID, 'autosave_draft_ids', $draft_ids );
                         return edit_post();
@@ -113 +113 @@
 
         // Reunite any orphaned attachments with their parent
+        if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) )
+                $draft_ids = array();
+        if ( $draft_temp_id = array_search( $post_ID, $draft_ids ) )
+                relocate_children( $draft_temp_id, $post_ID );
+        if ( $temp_id && $temp_id != $draft_temp_id )
+                relocate_children( $temp_id, $post_ID );
+
         // Update autosave collision detection
         if ( $temp_id ) {
-                relocate_children( $temp_id, $post_ID );
                 $draft_ids[$temp_id] = $post_ID;
                 update_user_option( $user_ID, 'autosave_draft_ids', $draft_ids );
@@ -140 +146 @@
         $post = & get_post( $post_ID, ARRAY_A );
 
-        $search = "#<a[^>]+rel=('|\" )[^'\"]*attachment[^>]*>#ie";
+        $search = "#<a[^>]+rel=('|\")[^'\"]*attachment[^>]*>#ie";
 
         // See if we have any rel="attachment" links
@@ -147 +153 @@
 
         $i = 0;
-        $search = "#[\s]+rel=(\"|' )(.*? )wp-att-(\d+ )\\1#i";
+        $search = "#[\s]+rel=(\"|')(.*?)wp-att-(\d+)\\1#i";
         foreach ( $anchor_matches[0] as $anchor ) {
                 if ( 0 == preg_match( $search, $anchor, $id_matches ) )
@@ -280 +286 @@
         add_meta( $post_ID );
 
-        wp_update_post( $_POST);
+        wp_update_post( $_POST );
+
+        // Reunite any orphaned attachments with their parent
+        if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) )
+                $draft_ids = array();
+        if ( $draft_temp_id = array_search( $post_ID, $draft_ids ) )
+                relocate_children( $draft_temp_id, $post_ID );
 
         // Now that we have an ID we can fix any attachment anchor hrefs