Changeset 4760

Timestamp:

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

Author:

ryan

Message:

Autosave fixes from mdawaffe. fixes #3601

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/admin-functions.php (modified) (3 diffs)
• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/edit-page-form.php (modified) (1 diff)
• wp-includes/js/autosave-js.php (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -221 +221 @@
     $x->send();
     break;
-case 'autosave' :
+case 'autosave' : // The name of this action is hardcoded in edit_post()
     $_POST['post_content'] = $_POST['content'];
     $_POST['post_excerpt'] = $_POST['excerpt'];

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;
     }
 

trunk/wp-admin/edit-form-advanced.php

@@ -18 +18 @@
 if (0 == $post_ID) {
     $form_action = 'post';
-    $temp_ID = -1 * time();
+    $temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post()
     $form_extra = "<input type='hidden' id='post_ID' name='temp_ID' value='$temp_ID' />";
     wp_nonce_field('add-post');

trunk/wp-admin/edit-page-form.php

@@ -6 +6 @@
     $form_action = 'post';
     $nonce_action = 'add-page';
-    $temp_ID = -1 * time();
+    $temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post()
     $form_extra = "<input type='hidden' id='post_ID' name='temp_ID' value='$temp_ID' />";
 } else {

trunk/wp-includes/js/autosave-js.php

@@ -8 +8 @@
     var form = $('post');
     autosaveLast = form.post_title.value+form.content.value;
+    // Keep autosave_interval in sync with edit_post().
     autosavePeriodical = new PeriodicalExecuter(autosave, <?php echo apply_filters('autosave_interval', '120'); ?>);
     //Disable autosave after the form has been submitted
@@ -86 +87 @@
     form.publish ? form.publish.disabled = 'disabled' : null;
     form.deletepost ? form.deletepost.disabled = 'disabled' : null;
+    setTimeout('autosave_enable_buttons();', 1000); // Re-enable 1 sec later.  Just gives autosave a head start to avoid collisions.
 }
 

trunk/wp-includes/script-loader.php

@@ -20 +20 @@
         $this->add( 'wp_tiny_mce', $mce_config, array('tiny_mce'), '20061113' );
         $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.0');
-        $this->add( 'autosave', '/wp-includes/js/autosave-js.php', array('prototype', 'sack'), '4508');
+        $this->add( 'autosave', '/wp-includes/js/autosave-js.php', array('prototype', 'sack'), '20070116');
         $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax-js.php', array('prototype'), '4459');
         $this->add( 'listman', '/wp-includes/js/list-manipulation-js.php', array('wp-ajax', 'fat'), '4583');