Changeset 23735 for trunk/wp-includes/revision.php

Timestamp:

03/16/2013 09:15:43 PM (13 years ago)

Author:

azaozz

Message:

Create one autosave per user rather than a single autosave for all users. Remove unused code from autosave.js and wp_ajax_autosave(). See #23665.

File:

• trunk/wp-includes/revision.php (modified) (8 diffs)

trunk/wp-includes/revision.php

@@ -136 +136 @@
  *
  * Returns a post object containing the information that was autosaved for the
- * specified post.
- *
- * @package WordPress
- * @subpackage Post_Revisions
- * @since 2.6.0
- *
+ * specified post. If the optional $user_id is passed, returns the autosave for that user
+ * otherwise returns the latest autosave.
+ *
+ * @package WordPress
+ * @subpackage Post_Revisions
+ * @since 2.6.0
+ * @uses wp_get_post_revisions()
+ *  
  * @param int $post_id The post ID.
+ * @param int $user_id optional The post author ID.
  * @return object|bool The autosaved data or false on failure or when no autosave exists.
  */
-function wp_get_post_autosave( $post_id ) {
-
-    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_post_autosave_hack' );
-    $autosave = $autosave_query->query( $q );
-    remove_action( 'parse_query', '_wp_get_post_autosave_hack' );
-
-    if ( $autosave && is_array($autosave) && is_object($autosave[0]) )
-        return $autosave[0];
+function wp_get_post_autosave( $post_id, $user_id = 0 ) {
+    $revisions = wp_get_post_revisions($post_id);
+
+    foreach ( $revisions as $revision ) {
+        if ( false !== strpos( $revision->post_name, "{$post_id}-autosave" ) ) {
+            if ( $user_id && $user_id != $revision->post_author )
+                continue;
+
+            return $revision;
+            break;
+        }
+    }
 
     return false;
-}
-
-/**
- * Internally used to hack WP_Query into submission.
- *
- * @package WordPress
- * @subpackage Post_Revisions
- * @since 2.6.0
- *
- * @param object $query WP_Query object
- */
-function _wp_get_post_autosave_hack( $query ) {
-    $query->is_single = false;
 }
 
@@ -196 +177 @@
     if ( !$post = wp_get_post_revision( $post ) )
         return false;
+
     return (int) $post->post_parent;
 }
@@ -212 +194 @@
     if ( !$post = wp_get_post_revision( $post ) )
         return false;
-    if ( "{$post->post_parent}-autosave" !== $post->post_name )
-        return false;
-    return (int) $post->post_parent;
+
+    if ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) )
+        return (int) $post->post_parent;
+
+    return false;
 }
 
@@ -235 +219 @@
     elseif ( !is_array($post) )
         $post = get_post($post, ARRAY_A);
+
     if ( !$post || empty($post['ID']) )
         return;
@@ -250 +235 @@
     if ( $revision_id )
         do_action( '_wp_put_post_revision', $revision_id );
+
     return $revision_id;
 }
@@ -313 +299 @@
 
     $update = array();
-    foreach( array_intersect( array_keys( $revision ), $fields ) as $field )
+    foreach( array_intersect( array_keys( $revision ), $fields ) as $field ) {
         $update[$field] = $revision[$field];
+    }
 
     if ( !$update )
@@ -375 +362 @@
  */
 function wp_get_post_revisions( $post_id = 0, $args = null ) {
-    if ( ! WP_POST_REVISIONS )
-        return array();
     if ( ( !$post = get_post( $post_id ) ) || empty( $post->ID ) )
         return array();
@@ -386 +371 @@
     if ( !$revisions = get_children( $args ) )
         return array();
+
     return $revisions;
 }