Ticket #20299: 20299.diff

src/wp-admin/includes/post.php

@@ -1699 +1699 @@
         // _wp_put_post_revision() expects unescaped.
         $post_data = wp_unslash( $post_data );
 
+        /**
+         * Fires before an autosave is created.
+         *
+         * @since 4.4.0
+         *
+         * @param array $new_autosave Post array - the autosave that is about to be saved.
+         */
+        do_action( 'wp_before_creating_autosave', $post_data );
+
         // Otherwise create the new autosave as a special post revision
         return _wp_put_post_revision( $post_data, true );
 }
@@ -1844 +1853 @@
          */
         wp_redirect( apply_filters( 'redirect_post_location', $location, $post_id ) );
         exit;
-}
- No newline at end of file
+}

src/wp-admin/post.php

@@ -40 +40 @@
 
 if ( isset( $_POST['deletepost'] ) )
         $action = 'delete';
-elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
+elseif ( isset( $_POST['wp-preview'] ) && 'dopreview' == $_POST['wp-preview'] ) {
         $action = 'preview';
+        /**
+         * Set DOING_PREVIEW during previews.
+         */
+        if ( ! defined( 'DOING_PREVIEW' ) ) {
+                define( 'DOING_PREVIEW', true );
+        }
+}
 
 $sendback = wp_get_referer();
 if ( ! $sendback ||

src/wp-includes/js/autosave.js

@@ -37 +37 @@
                                 excerpt: $( '#excerpt' ).val() || ''
                         };
 
+                        /**
+                         * Attach revisioned meta field values to the autosave data.
+                         *
+                         * Iterates thru the revisioned meta fields, searhing the DOM for elements
+                         * with matching ID, then storing the value as data[ID]. Enables inclusion
+                         * of the revisioned post meta data as part of the autosave.
+                         */
+                        $( autosaveL10n.revisionedMetas ).each( function( index, meta ) {
+                                data[meta] = $( document.getElementById( meta ) ).val() || '';
+                        } );
+
                         if ( type === 'local' ) {
                                 return data;
                         }

src/wp-includes/revision.php

@@ -509 +509 @@
 
         add_filter( 'get_the_terms', '_wp_preview_terms_filter', 10, 3 );
 
+        /**
+         * When doing a preview, use the autosaved revisioned post meta.
+         */
+        add_filter( 'get_post_metadata', array( WP_Post_Meta_Revisioning, '_wp_preview_meta_filter' ), 10, 4 );
+
         return $post;
 }
 

src/wp-includes/script-loader.php

@@ -807 +807 @@
  */
 function wp_just_in_time_script_localization() {
 
+        /**
+         * Pass some data to the autosave JavaScript:
+         *      int   autosaveL10n.autosaveInterval How frequently to autosave.
+         *      int   autosaveL10n.blog_id          The current blog ID.
+         *      array autosaveL10n.revisionedMetas  The revisioned meta keys.
+         */
         wp_localize_script( 'autosave', 'autosaveL10n', array(
                 'autosaveInterval' => AUTOSAVE_INTERVAL,
-                'blog_id' => get_current_blog_id(),
+                'blog_id'          => get_current_blog_id(),
+                'revisionedMetas'  => WP_Post_Meta_Revisioning::_wp_post_revision_meta_keys(),
         ) );
 
 }

tests/phpunit/tests/post/revisions.php

@@ -1 +1 @@
 <?php
 
+require( 'src/wp-content/plugins/wp-post-meta-revisions/wp-post-meta-revisions.php' );
 /**
  * @group post
  * @group revision
@@ -389 +390 @@
 
                 $this->assertEquals( $revision_ids, array_values( wp_list_pluck( $revisions, 'ID' ) ) );
         }
+
+        /**
+         * Preview changes on a published post makes all post meta "live"
+         * @ticket 20299
+         */
+        function test_meta_stored_to_preview_autosave(){
+
+                /**
+                 * Set up a user for autosaves.
+                 */
+                $editor_user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
+                $user = new WP_User( $editor_user_id );
+                wp_set_current_user( $editor_user_id );
+
+                $postd = array(
+                        'post_author'  => $editor_user_id,
+                        'post_content' => 'the content',
+                        'post_title'   => 'the title',
+                        'post_status'  => 'publish',
+                );
+                /**
+                 * Insert a test post.
+                 */
+                $post_id = self::factory()->post->create( $postd );
+
+                /**
+                 * Add some post meta.
+                 */
+                update_post_meta( $post_id, 'publish_meta_test', 'original' );
+
+                /**
+                 * Revision the 'publish_meta_test' meta.
+                 */
+                add_filter( 'wp_post_revision_meta_keys', function( $keys ) {
+                        $keys[] = 'publish_meta_test';
+                        return $keys;
+                } );
+
+                /**
+                 * Set up $_POST for autosave.
+                 */
+                $_POST['post_ID']           = $post_id;
+                $_POST['post_type']         = 'post';
+                $_POST['post_title']        = 'new title';
+                $_POST['publish_meta_test'] = 'new_value';
+
+                /**
+                 * Create an autosave
+                 */
+                $id = wp_create_post_autosave( $post_id );
+
+                /**
+                 * Verify the new meta value was autosaved.
+                 */
+                $revisioned_meta = get_post_meta( $id, 'publish_meta_test', true );
+                $this->assertEquals( $revisioned_meta[0], 'new_value' );
+
+                /**
+                 * Clean up.
+                 */
+                wp_delete_post( $post_id );
+                wp_delete_post( $id );
+                wp_delete_post( $post_id );
+        }
+
+
 }