Changeset 4760 for trunk/wp-admin/admin-functions.php

Timestamp:

01/18/2007 03:32:54 AM (20 years ago)

Author:

ryan

Message:

Autosave fixes from mdawaffe. fixes #3601

File:

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

trunk/wp-admin/admin-functions.php

@@ -19 +19 @@
                 if ( !current_user_can( 'edit_posts' ) )
                         return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this blog.' ) );
+        }
+
+
+        // Check for autosave collisions
+        if ( isset($_POST['temp_ID']) ) {
+                $temp_id = (int) $_POST['temp_ID'];
+                if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) )
+                        $draft_ids = array();
+                foreach ( $draft_ids as $temp => $real )
+                        if ( time() + $temp > 86400 ) // 1 day: $temp is equal to -1 * time( then )
+                                unset($draft_ids[$temp]);
+
+                if ( isset($draft_ids[$temp_id]) ) { // Edit, don't write
+                        $_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();
+                }
         }
 
@@ -89 +108 @@
 
         // Create the post.
-        $post_ID = wp_insert_post( $_POST);
+        $post_ID = wp_insert_post( $_POST );
+
         add_meta( $post_ID );
 
         // Reunite any orphaned attachments with their parent
-        if ( $_POST['temp_ID'] )
-                relocate_children( $_POST['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 );
+        }
 
         // Now that we have an ID we can fix any attachment anchor hrefs
@@ -164 +188 @@
                 if ( !current_user_can( 'edit_post', $post_ID ) )
                         wp_die( __('You are not allowed to edit this post.' ));
+        }
+
+        // Autosave shouldn't save too soon after a real save
+        if ( 'autosave' == $_POST['action'] ) {
+                $post =& get_post( $post_ID );
+                $now = time();
+                $then = strtotime($post->post_date_gmt . ' +0000');
+                // Keep autosave_interval in sync with autosave-js.php.
+                $delta = apply_filters( 'autosave_interval', 120 ) / 2;
+                if ( ($now - $then) < $delta )
+                        return $post_ID;
         }