Ticket #16215: 16215.6.diff

wp-includes/default-filters.php

@@ -250 +250 @@
 add_action( 'plugins_loaded',             'wp_maybe_load_widgets',                    0    );
 add_action( 'plugins_loaded',             'wp_maybe_load_embeds',                     0    );
 add_action( 'shutdown',                   'wp_ob_end_flush_all',                      1    );
-add_action( 'pre_post_update',            'wp_save_post_revision',                   10, 2 );
+add_action( 'pre_post_update',            'wp_save_post_revision',                   10, 1 );
+add_action( 'post_updated',               'wp_save_post_revision',                   10, 1 );
 add_action( 'publish_post',               '_publish_post_hook',                       5, 1 );
 add_action( 'transition_post_status',     '_transition_post_status',                  5, 3 );
 add_action( 'transition_post_status',     '_update_term_count_on_transition_post_status', 10, 3 );

wp-includes/revision.php

@@ -62 +62 @@
 /**
  * Saves an already existing post as a post revision.
  *
- * Typically used immediately prior to post updates.
+ * Typically used immediately prior and after post updates.
+ * Prior to update checks for old revision data (latest revision != current post before update) and adds a copy of the current post as a revision if missing
+ * After update adds a copy of the current post as a revision, so latest revision always matches current post
  *
  * @package WordPress
  * @subpackage Post_Revisions
  * @since 2.6.0
  *
  * @uses _wp_put_post_revision()
+ * @uses wp_first_revision_matches_current_version()
  *
  * @param int $post_id The ID of the post to save as a revision.
  * @return mixed Null or 0 if error, new revision ID, if success.
  */
-function wp_save_post_revision( $post_id, $new_data = null ) {
-        // We do autosaves manually with wp_create_post_autosave()
+function wp_save_post_revision( $post_id ) {
+        //check to see if the post's first revision already matches the post data
+        //should be true before post update, _except_ for old data which
+        //doesn't include a copy of the current post data in revisions
+        if ( wp_first_revision_matches_current_version( $post_id ) )
+                return;
+
         if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
                 return;
 
@@ -82 +90 @@
         if ( ! WP_POST_REVISIONS )
                 return;
 
-        if ( !$post = get_post( $post_id, ARRAY_A ) )
+        if ( ! $post = get_post( $post_id, ARRAY_A ) )
                 return;
 
         if ( 'auto-draft' == $post['post_status'] )
                 return;
 
-        if ( !post_type_supports($post['post_type'], 'revisions') )
+        if ( ! post_type_supports( $post['post_type'], 'revisions' ) )
                 return;
 
-        // if new data is supplied, check that it is different from last saved revision, unless a plugin tells us to always save regardless
-        if ( apply_filters( 'wp_save_post_revision_check_for_changes', true, $post, $new_data ) && is_array( $new_data ) ) {
-                $post_has_changed = false;
-                foreach ( array_keys( _wp_post_revision_fields() ) as $field ) {
-                        if ( normalize_whitespace( $new_data[ $field ] ) != normalize_whitespace( $post[ $field ] ) ) {
-                                $post_has_changed = true;
-                                break;
+        // compare the proposed update with the last stored revision, verify
+        // different, unless a plugin tells us to always save regardless
+        if ( $revisions = wp_get_post_revisions( $post_id ) ) { // grab the last revision
+                $last_revision = array_shift( $revisions );
+
+                if ( $last_revision_array = get_post( $last_revision->ID, ARRAY_A ) ) { //if no previous revisions, save one for sure
+
+                        if ( apply_filters( 'wp_save_post_revision_check_for_changes', true, $last_revision_array, $post ) && is_array( $post ) ) {
+                                $post_has_changed = false;
+
+                                foreach ( array_keys( _wp_post_revision_fields() ) as $field ) {
+
+                                        if ( normalize_whitespace( $post[ $field ] ) != normalize_whitespace( $last_revision_array[ $field ] ) ) {
+                                                $post_has_changed = true;
+                                                break;
+
+                                        }
+                                }
+
+                                //don't save revision if post unchanged
+                                if( ! $post_has_changed )
+                                        return;
                         }
                 }
-                //don't save revision if post unchanged
-                if( ! $post_has_changed )
-                        return;
         }
 
         $return = _wp_put_post_revision( $post );
 
         // WP_POST_REVISIONS = true (default), -1
-        if ( !is_numeric( WP_POST_REVISIONS ) || WP_POST_REVISIONS < 0 )
+        if ( ! is_numeric( WP_POST_REVISIONS ) || WP_POST_REVISIONS < 0 )
                 return $return;
 
         // all revisions and (possibly) one autosave
         $revisions = wp_get_post_revisions( $post_id, array( 'order' => 'ASC' ) );
 
         // WP_POST_REVISIONS = (int) (# of autosaves to save)
-        $delete = count($revisions) - WP_POST_REVISIONS;
+        $delete = count( $revisions ) - WP_POST_REVISIONS;
 
         if ( $delete < 1 )
                 return $return;
@@ -123 +143 @@
         $revisions = array_slice( $revisions, 0, $delete );
 
         for ( $i = 0; isset($revisions[$i]); $i++ ) {
-                if ( false !== strpos( $revisions[$i]->post_name, 'autosave' ) )
+                if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) )
                         continue;
-                wp_delete_post_revision( $revisions[$i]->ID );
+                wp_delete_post_revision( $revisions[ $i ]->ID );
         }
 
         return $return;
@@ -418 +438 @@
                 add_filter('the_preview', '_set_preview');
         }
 }
+
+/**
+ * Determines if the specified post's most recent revision matches the post (by checking post_modified).
+ *
+ * @package WordPress
+ * @subpackage Post_Revisions
+ * @since 3.6.0
+ *
+ * @param int|object $post Post ID or post object.
+ * @return bool false if not a match, otherwise true.
+ */
+function wp_first_revision_matches_current_version( $post ) {
+
+        if ( ! $post = get_post( $post ) )
+                return false;
+
+        if ( ! $revisions = wp_get_post_revisions( $post->ID ) )
+                return false;
+
+        $last_revision = array_shift( $revisions );
+
+        if ( ! ($last_revision->post_modified == $post->post_modified ) )
+                return false;
+
+        return true;
+}