Changeset 7907 for trunk/wp-includes/post.php

Timestamp:

05/08/2008 05:25:07 PM (17 years ago)

Author:

ryan

Message:

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

File:

• trunk/wp-includes/post.php (modified) (13 diffs)

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
  *
- * Does two things. If passed a postn *array*, it will return a post array ready to be
+ * Does two things. If passed a post *array*, it will return a post array ready to be
  * insterted into the posts table as a post revision.
- * Otherwise, returns an array whose keys are the post fields to be saved post revisions.
+ * Otherwise, returns an array whose keys are the post fields to be saved for post revisions.
  *
  * @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
  */
-function _wp_revision_fields( $post = null ) {
+function _wp_revision_fields( $post = null, $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';
-    $return['post_name']     = "$post[ID]-revision";
+    $return['post_name']     = $autosave ? "$post[ID]-autosave" : "$post[ID]-revision";
     $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;
 
-    // TODO: open this up for pages also
-    if ( 'post' != $post->post_type )
+    if ( !in_array( $post['post_type'], array( 'post', 'page' ) ) )
         return;
 
@@ -3031 +3033 @@
 
 /**
- * _wp_put_revision() - Inserts post data into the posts table as a post revision
+ * wp_get_autosave() - returns the autosaved data of the specified post.
+ *
+ * Returns a post object containing the information that was autosaved for the specified post.
  *
  * @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
  */
-function _wp_put_revision( $post = null ) {
+function _wp_put_revision( $post = null, $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' ) );
 
-    $post = _wp_revision_fields( $post );
-
-    if ( $revision_id = wp_insert_post( $post ) )
+    $post = _wp_revision_fields( $post, $autosave );
+
+    $revision_id = wp_insert_post( $post );
+    if ( is_wp_error($revision_id) )
+        return $revision_id;
+
+    if ( $revision_id )
         do_action( '_wp_put_revision', $revision_id );
-
     return $revision_id;
 }
@@ -3128 +3175 @@
     $update['ID'] = $revision['post_parent'];
 
-    if ( $post_id = wp_update_post( $update ) )
+    $post_id = wp_update_post( $update );
+    if ( is_wp_error( $post_id ) )
+        return $post_id;
+
+    if ( $post_id )
         do_action( 'wp_restore_revision', $post_id, $revision['ID'] );
 
@@ -3154 +3205 @@
         return $revision;
 
-    if ( $delete = wp_delete_post( $revision->ID ) )
+    $delete = wp_delete_post( $revision->ID );
+    if ( is_wp_error( $delete ) )
+        return $delete;
+
+    if ( $delete )
         do_action( 'wp_delete_revision', $revision->ID, $revision );
 
@@ -3175 +3230 @@
     if ( ( !$post = get_post( $post_id ) ) || empty( $post->ID ) )
         return array();
-
-    if ( !$revisions = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'revision' ) ) )
+    if ( !$revisions = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'revision', 'post_status' => 'inherit' ) ) )
         return array();
     return $revisions;
 }
-
-?>