Changeset 7907

Timestamp:

05/08/08 17:25:07 (2 months ago)

Author:

ryan

Message:

Move autosave to post revisions. Props mdawaffe. see #6775

Files:

• trunk/wp-admin/admin-ajax.php (modified) (3 diffs)
• trunk/wp-admin/css/global.css (modified) (1 diff)
• trunk/wp-admin/edit-form-advanced.php (modified) (2 diffs)
• trunk/wp-admin/includes/post.php (modified) (9 diffs)
• trunk/wp-admin/revision.php (modified) (3 diffs)
• trunk/wp-includes/js/autosave.js (modified) (1 diff)
• trunk/wp-includes/pluggable.php (modified) (2 diffs)
• trunk/wp-includes/post-template.php (modified) (6 diffs)
• trunk/wp-includes/post.php (modified) (13 diffs)
• trunk/wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -462 +462 @@
-    define( 'DOING_AUTOSAVE', true );
-
-
+ 
-    global $current_user;
-
-    $_POST['post_status'] = 'draft';
-    $_POST['post_category'] = explode(",", $_POST['catslist']);
-    $_POST['tags_input'] = explode(",", $_POST['tags_input']);
@@ -479 +478 @@
-    $supplemental = array();
-
-
+$revision_id = 
-    if($_POST['post_ID'] < 0) {
+        $_POST['post_status'] = 'draft';
-        $_POST['temp_ID'] = $_POST['post_ID'];
-        if ( $do_autosave ) {
@@ -511 +511 @@
-                die(__('You are not allowed to edit this post.'));
-        }
+
-        if ( $do_autosave ) {
-
+
+
+
+
+
+
+
+
+
+
-            $data = $message;
-        } else {

trunk/wp-admin/css/global.css

@@ -195 +195 @@
-    padding-right: 280px;
-}
+
+.wrap h2.long-header {
+    padding-right: 0;
+}

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

@@ -1 @@
-
-
+
+
+
-if ( isset($_GET['message']) )
-    $_GET['message'] = absint( $_GET['message'] );
@@ -7 +8 @@
-$messages[3] = __('Custom field deleted.');
-$messages[4] = __('Post updated.');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    $form_action = 'post';
-    $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')
+$autosave = false
-} else {
-    $post_ID = (int) $post_ID;
-    $form_action = 'editpost';
-    $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
+    $autosave = wp_get_autosave( $post_id );
+    if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt ) > mysql2date( 'U', $post->post_modified_gmt ) )
+        $notice = sprintf( $notices[1], get_edit_post_link( $autosave->ID ) );
+}
+
+?>
+<?php if ( $notice ) : ?>
+<div id="notice" class="error"><p><?php echo $notice ?></p></div>
+<?php endif; ?>
+<?php if (isset($_GET['message'])) : ?>
+<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
+<?php endif; ?>
+
+<form name="post" action="post.php" method="post" id="post">
+<?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?>
+<input type="hidden" name="mode" value="bookmarklet" />
+<?php endif; ?>
+
+<div class="wrap">
+<h2><?php _e('Write Post') ?></h2>
+<?php
+
+if ( !isset($post_ID) || 0 == $post_ID)
+    wp_nonce_field('add-post');
+else
-    wp_nonce_field('update-post_' .  $post_ID);
-}
-
-$form_pingback = '<input type="hidden" name="post_pingback" value="' . (int) get_option('default_pingback_flag') . '" id="post_pingback" />';

trunk/wp-admin/includes/post.php

@@ -1 +1 @@
-<?php
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $_POST['post_content'] = $_POST['content'];
-    $_POST['post_excerpt'] = $_POST['excerpt'];
@@ -33 +22 @@
-    if (!empty ( $_POST['post_author_override'] ) ) {
-        $_POST['post_author'] = (int) $_POST['post_author_override'];
-
+ {
-        if (!empty ( $_POST['post_author'] ) ) {
-            $_POST['post_author'] = (int) $_POST['post_author'];
@@ -39 +28 @@
-            $_POST['post_author'] = (int) $_POST['user_ID'];
-        }
+    }
-
-    if ( $_POST['post_author'] != $_POST['user_ID'] ) {
-        if ( 'page' == $_POST['post_type'] ) {
-
-
+
+
+
+
+
+
-        } else {
-
-
-
+
+
+
+
+
+
-        }
-    }
@@ -62 +59 @@
-
-    if ( 'page' == $_POST['post_type'] ) {
-'publish' == $_POST['post_status'] && !current_user_can( 'publish_pages' )
+ 'publish' == $_POST['post_status'] && !current_user_can( 'publish_pages' ) 
-            $_POST['post_status'] = 'pending';
-    } else {
-'publish' == $_POST['post_status'] && !current_user_can( 'publish_posts' )
+ 'publish' == $_POST['post_status'] && !current_user_can( 'publish_posts' ) 
-            $_POST['post_status'] = 'pending';
-    }
@@ -75 +72 @@
-        $_POST['ping_status'] = 'closed';
-
- 
+
-        if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) {
-            $_POST['edit_date'] = '1';
@@ -82 +79 @@
-    }
-
-!empty 
+ !empty
-        $aa = $_POST['aa'];
-        $mm = $_POST['mm'];
@@ -93 +90 @@
-        $mn = ($mn > 59 ) ? $mn -60 : $mn;
-        $ss = ($ss > 59 ) ? $ss -60 : $ss;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    // Meta Stuff
@@ -237 +265 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-    // Create the post.
@@ -688 +646 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/wp-admin/revision.php

@@ -3 +3 @@
-require_once('admin.php');
-
-
-
-
-
-
+
-$revision_id = absint($revision);
-$diff        = absint($diff);
+$left        = absint($left);
+$right       = absint($right);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    // Don't allow reverse diffs?
-
-wp_redirect( add_query_arg( array( 'diff' => $revision->ID, 'revision' => $diff )
-exit
+ight_r
+$redirect = add_query_arg( array( 'left' => $right, 'right' => $left
+break
-    }
-
-
-
-
+
+
+
+
+
+
+
+
-
-    if (
-        // They're the same
-
-
-
-
+
-    ||
-        // Neither is a revision
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $right = $post->ID;
-    $left  = $revision->ID;
-}
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
-    exit;
-}
-
+// Converts post_author ID# into name
-add_filter( '_wp_revision_field_post_author', 'get_author_name' );
-
-$title = __( 'Post Revision' );
-
-require_once( 'admin-header.php' );
-
-$post_title = '<a href="' . get_edit_post_link() . '">' . get_the_title() . '</a>';
-$revision_time = wp_post_revision_time( $revision );
-?>
-
-<div class="wrap">
-
-style="padding-right: 0"><?php printf( $h2, $post_title, $revision_time )
+class="long-header"><?php echo $h2
-
-<table class="form-table ie-fixed">
-    <col class="th" />
-
-
+
-<tr id="revision">
-    <th scope="row"></th>
-
-
+
+
+
+
-</tr>
-
-<?php endif;
-
-
+filters
-$identical = true;
-foreach ( _wp_revision_fields() as $field => $field_title ) :
-
+
+
+
+
+
+
+
-        add_filter( "_wp_revision_field_$field", 'htmlspecialchars' );
-
-
-
-
-
+
-    }
-    $identical = false;
-    ?>
-
-?
+
-        <th scope="row"><?php echo wp_specialchars( $field_title ); ?></th>
- colspan="2"
+
-    </tr>
-
@@ -109 +148 @@
-endforeach;
-
-$diff
+'diff' == $action
-
-    ?>
-
-3"><div class="updated"><p><?php _e( 'These revisions are identical
+2"><div class="updated"><p><?php _e( 'These revisions are identical.
-
-    <?php
@@ -128 +167 @@
-
-<?php
-    wp_list_post_revisions( $post, array( 'format' => 'form-table', 'exclude' => $revision->ID, 'parent' => true, 'right' => $right, 'left' => $left ) );
-
-
+
+
+

trunk/wp-includes/js/autosave.js

@@ -169 +169 @@
-
-    var origStatus = jQuery('#original_post_status').val();
-    if ( 'draft' != origStatus ) // autosave currently only turned on for drafts
-        doAutoSave = false;
-
-    autosaveLast = jQuery("#title").val()+jQuery("#content").val();

trunk/wp-includes/pluggable.php

@@ -1393 +1393 @@
- */
-function wp_text_diff( $left_string, $right_string, $args = null ) {
-
+, 'title_left' => '', 'title_right' => ''
-    $args = wp_parse_args( $args, $defaults );
-
@@ -1426 +1426 @@
-    $r .= "<col class='ltype' /><col class='content' /><col class='ltype' /><col class='content' />";
-
+    if ( $args['title'] || $args['title_left'] || $args['title_right'] )
+        $r .= "<thead>";
-    if ( $args['title'] )
-
+
+
+
+
+
+
+
+
+
-
-    $r .= "<tbody>\n$diff\n</tbody>\n";

trunk/wp-includes/post-template.php

@@ -567 +567 @@
-
-/**
-me() - returns formatted datetimestamp of a revision
+tle() - returns formatted datetimestamp of a revision (linked to that revisions's page)
- *
- * @package WordPress
@@ -573 +573 @@
- * @since 2.6
- *
- * @uses wp_get_revision()
- * @uses date_i18n()
- *
- * @param int|object $revision revision ID or revision object
+ * @param bool $link optional Link to revisions's page?
- * @return string i18n formatted datetimestamp or localized 'Corrent Revision'
- */
-
-
-
-
+
+
-        return $revision;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -606 +618 @@
- *
- * @uses wp_get_post_revisions()
-m
+tl
- * @uses get_edit_post_link()
- * @uses get_author_name()
@@ -631 +643 @@
-    $class = false;
-    foreach ( $revisions as $revision ) {
-
-
-
+
-        $name = get_author_name( $revision->post_author );
-
-        if ( 'form-table' == $format ) {
-            if ( $left )
-old
+left
-            else
-old_checked = $new_checked ? ' checked="checked"' : '';
-new
+left_checked = $right_checked ? ' checked="checked"' : ''; // [sic] (the next one)
+right
-
-            $class = $class ? '' : " class='alternate'";
-
-            if ( $post->ID != $revision->ID && current_user_can( 'edit_post', $post->ID ) )
-restore
+action
-            else
-                $actions = '';
-
-            $rows .= "<tr$class>\n";
-diff' value='$revision->ID'$old_checked /><input type='radio' name='revision' value='$revision->ID'$new
+left' value='$revision->ID'$left_checked /><input type='radio' name='right' value='$revision->ID'$right
-            $rows .= "\t<td>$date</td>\n";
-            $rows .= "\t<td>$name</td>\n";
@@ -657 +667 @@
-            $rows .= "</tr>\n";
-        } else {
-
+
+
-        }
-    }
@@ -668 +679 @@
-    <div class="alignleft">
-        <input type="submit" class="button-secondary" value="<?php _e( 'Compare Revisions' ); ?>" />
+        <input type="hidden" name="action" value="diff" />
-    </div>
-</div>

trunk/wp-includes/post.php

@@ -89 +89 @@
-
-    $children = get_posts( $r );
-
-    if ( !$children )
-        return false;
@@ -2958 +2957 @@
- * _wp_revision_fields() - determines which fields of posts are to be saved in revisions
- *
-n
+
- * insterted into the posts table as a post revision.
-
+for 
- *
- * @package WordPress
@@ -2967 +2966 @@
- *
- * @param array $post optional a post array to be processed for insertion as a post revision
+ * @param bool $autosave optional Is the revision an autosave?
- * @return array post array ready to be inserted as a post revision or array of fields that can be versioned
- */
-
+, $autosave = false
-    static $fields = false;
-
@@ -2981 +2981 @@
-        );
-
+        // Runs only once
+        $fields = apply_filters( '_wp_revision_fields', $fields );
+
-        // WP uses these internally either in versioning or elsewhere - they cannot be versioned
-        foreach ( array( 'ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count' ) as $protect )
@@ -2996 +2999 @@
-    $return['post_status']   = 'inherit';
-    $return['post_type']     = 'revision';
-
+$autosave ? "$post[ID]-autosave" : 
-    $return['post_date']     = $post['post_modified'];
-    $return['post_date_gmt'] = $post['post_modified_gmt'];
@@ -3016 +3019 @@
- */
-function wp_save_revision( $post_id ) {
-TODO: rework autosave to use special type of post revision
+We do autosaves manually with wp_create_autosave()
-    if ( @constant( 'DOING_AUTOSAVE' ) )
-        return;
@@ -3023 +3026 @@
-        return;
-
-
-
+
-        return;
-
@@ -3031 +3033 @@
-
-/**
-
+
+
+
- *
- * @package WordPress
@@ -3037 +3041 @@
- * @since 2.6
- *
+ * @param int $post_id The post ID
+ * @return object|bool the autosaved data or false on failure or when no autosave exists
+ */
+function wp_get_autosave( $post_id ) {
+    global $wpdb;
+    if ( !$post = get_post( $post_id ) )
+        return false;
+
+    $q = array(
+        'name' => "{$post->ID}-autosave",
+        'post_parent' => $post->ID,
+        'post_type' => 'revision',
+        'post_status' => 'inherit'
+    );
+
+    // Use WP_Query so that the result gets cached
+    $autosave_query = new WP_Query;
+
+    add_action( 'parse_query', '_wp_get_autosave_hack' );
+    $autosave = $autosave_query->query( $q );
+    remove_action( 'parse_query', '_wp_get_autosave_hack' );
+
+    if ( $autosave && is_array($autosave) && is_object($autosave[0]) )
+        return $autosave[0];
+
+    return false;
+}
+
+// Internally used to hack WP_Query into submission
+function _wp_get_autosave_hack( $query ) {
+    $query->is_single = false;
+}
+
+/**
+ * _wp_put_revision() - Inserts post data into the posts table as a post revision
+ *
+ * @package WordPress
+ * @subpackage Post Revisions
+ * @since 2.6
+ *
- * @uses wp_insert_post()
- *
- * @param int|object|array $post post ID, post object OR post array
+ * @param bool $autosave optional Is the revision an autosave?
- * @return mixed null or 0 if error, new revision ID if success
- */
-
+, $autosave = false
-    if ( is_object($post) )
-        $post = get_object_vars( $post );
-    elseif ( !is_array($post) )
-        $post = get_post($post, ARRAY_A);
-
-    if ( !$post || empty($post['ID']) )
-        return;
@@ -3054 +3098 @@
-        return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
-
-
-
-
+
+
+
+
+
+
+
-        do_action( '_wp_put_revision', $revision_id );
-
-    return $revision_id;
-}
@@ -3128 +3175 @@
-    $update['ID'] = $revision['post_parent'];
-
-
+
+
+
+
+
-        do_action( 'wp_restore_revision', $post_id, $revision['ID'] );
-
@@ -3154 +3205 @@
-        return $revision;
-
-
+
+
+
+
+
-        do_action( 'wp_delete_revision', $revision->ID, $revision );
-
@@ -3175 +3230 @@
-    if ( ( !$post = get_post( $post_id ) ) || empty( $post->ID ) )
-        return array();
-
-
+
-        return array();
-    return $revisions;
-}
-
-?>

trunk/wp-includes/script-loader.php

@@ -48 +48 @@
-        ) );
-
-424
+507
-
-        $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax.js', array('prototype'), '20070306');