Index: wp-includes/js/autosave.js =================================================================== --- wp-includes/js/autosave.js (revision 24974) +++ wp-includes/js/autosave.js (working copy) @@ -322,7 +322,7 @@ (function($){ // Returns the data for saving in both localStorage and autosaves to the server wp.autosave.getPostData = function() { - var ed = typeof tinymce != 'undefined' ? tinymce.activeEditor : null, post_name, parent_id, cats = [], + var ed = typeof tinymce != 'undefined' ? tinymce.activeEditor : null, post_name, parent_id, post_format, cats = [], data = { action: 'autosave', autosave: true, @@ -381,6 +381,14 @@ if ( $('#auto_draft').val() == '1' ) data['auto_draft'] = '1'; + post_format = $('#post_format').val() || ''; + data['post_format'] = post_format == 'standard' ? '' : post_format; + + // Add the post format selected on the edit screen. + $('#post-formats-select').find('input[name="post_format"]').each( function(i, field) { + data[ field.name ] = $(field).is(':checked') || ''; + }); + return data; }; Index: wp-includes/revision.php =================================================================== --- wp-includes/revision.php (revision 24974) +++ wp-includes/revision.php (working copy) @@ -59,6 +59,26 @@ } /** + * Determines which post meta fields are revisioned. + * + * @since 3.6 + * @access private + * @return array An array of meta keys that should be revisioned. + */ +function _wp_post_revision_meta_keys() { + $keys = array( + '_wp_format_url', + '_wp_format_quote', + '_wp_format_quote_source', + '_wp_format_image', + '_wp_format_gallery', + '_wp_format_audio', + '_wp_format_video', + ); + return $keys; +} + +/** * Saves an already existing post as a post revision. * * Typically used immediately after post updates. @@ -102,13 +122,27 @@ if ( isset( $last_revision ) && apply_filters( 'wp_save_post_revision_check_for_changes', true, $last_revision, $post ) ) { $post_has_changed = false; + // Check whether revisioned fields have been changed foreach ( array_keys( _wp_post_revision_fields() ) as $field ) { if ( normalize_whitespace( $post->$field ) != normalize_whitespace( $last_revision->$field ) ) { $post_has_changed = true; break; } } - //don't save revision if post unchanged + + // Check whether revisioned meta fields have changed + foreach ( _wp_post_revision_meta_keys() as $meta_key ) { + if ( get_post_meta( $post->ID, $meta_key ) != get_post_meta( $last_revision->ID, $meta_key ) ) { + $post_has_changed = true; + break; + } + } + + // Check whether the post format has changed + if ( get_post_format( $post->ID ) != get_post_meta( $last_revision->ID, '_revision_post_format', true ) ) + $post_has_changed = true; + + // Don't save revision if post unchanged if( ! $post_has_changed ) return; } @@ -240,9 +274,22 @@ if ( $revision_id ) do_action( '_wp_put_post_revision', $revision_id ); - return $revision_id; -} + // Save revisioned meta fields. + foreach ( _wp_post_revision_meta_keys() as $meta_key ) { + $meta_value = get_post_meta( $post_id, $meta_key, true ); + if ( empty( $meta_value ) ) + continue; + // Use the underlying add_metadata vs add_post_meta to make sure + // metadata is added to the revision post and not its parent. + add_metadata( 'post', $revision_id, $meta_key, wp_slash( $meta_value ) ); + } + // Save the post format + if ( $post_format = get_post_format( $post_id ) ) + add_metadata( 'post', $revision_id, '_revision_post_format', $post_format ); + return $revision_id; + } + /** * Gets a post revision. * @@ -308,8 +355,30 @@ $update['ID'] = $revision['post_parent']; + // Restore revisioned meta fields. + foreach ( _wp_post_revision_meta_keys() as $meta_key ) { + $meta_value = get_post_meta( $revision['ID'], $meta_key, true ); + if ( empty( $meta_value ) ) + $meta_value = ''; + // Add slashes to data pulled from the db + update_post_meta( $update['ID'], $meta_key, wp_slash( $meta_value ) ); + } + $update = wp_slash( $update ); //since data is from db + // Restore post format + set_post_format( $update['ID'], get_post_meta( $revision['ID'], '_revision_post_format', true ) ); + // Restore revisioned meta fields. + foreach ( _wp_post_revision_meta_keys() as $meta_key ) { + delete_post_meta( $update['ID'], $meta_key ); + $meta_values = get_post_meta( $revision['ID'], $meta_key ); + if ( false === $meta_values ) + continue; + + foreach ( $meta_values as $meta_value ) + add_post_meta( $update['ID'], $meta_key, $meta_value ); + } + $post_id = wp_update_post( $update ); if ( ! $post_id || is_wp_error( $post_id ) ) return $post_id; @@ -449,6 +518,7 @@ $post->post_excerpt = $preview->post_excerpt; add_filter( 'get_the_terms', '_wp_preview_terms_filter', 10, 3 ); + add_filter( 'get_post_metadata', '_wp_preview_meta_filter', 10, 4 ); return $post; } @@ -472,6 +542,23 @@ } /** + * Filters post meta retrieval to get values from the actual autosave post, + * and not its parent. Filters revisioned meta keys only. + * + * @since 3.6.0 + * @access private + */ +function _wp_preview_meta_filter( $value, $object_id, $meta_key, $single ) { + $post = get_post(); + if ( empty( $post ) || $post->ID != $object_id || ! in_array( $meta_key, _wp_post_revision_meta_keys() ) || 'revision' == $post->post_type ) + return $value; + $preview = wp_get_post_autosave( $post->ID ); + if ( ! is_object( $preview ) ) + return $value; + return get_post_meta( $preview->ID, $meta_key, $single ); +} + +/** * Filters terms lookup to set the post format. * * @since 3.6.0 Index: wp-admin/includes/post.php =================================================================== --- wp-admin/includes/post.php (revision 24974) +++ wp-admin/includes/post.php (working copy) @@ -1327,6 +1327,24 @@ $new_autosave['ID'] = $old_autosave->ID; $new_autosave['post_author'] = $post_author; + // Auto-save revisioned meta fields. + foreach ( _wp_post_revision_meta_keys() as $meta_key ) { + if ( isset( $_POST[ $meta_key ] ) && get_post_meta( $new_autosave['ID'], $meta_key, true ) != $_POST[ $meta_key ] ) { + // Use the underlying delete_metadata and add_metadata vs delete_post_meta + // and add_post_meta to make sure we're working with the actual revision meta. + delete_metadata( 'post', $new_autosave['ID'], $meta_key ); + if ( ! empty( $_POST[ $meta_key ] ) ) + add_metadata( 'post', $new_autosave['ID'], $meta_key, $_POST[ $meta_key ] ); + } + } + + // Save the post format as part of the autosave if different. + if ( isset( $_POST['post_format'] ) && get_post_meta( $new_autosave['ID'], '_revision_post_format', true ) != $_POST['post_format'] ) { + delete_metadata( 'post', $new_autosave['ID'], '_revision_post_format' ); + if ( ! empty( $_POST['post_format'] ) ) + update_metadata( 'post', $new_autosave['ID'], '_revision_post_format', $_POST['post_format'] ); + } + // If the new autosave is the same content as the post, delete the old autosave. $post = get_post( $post_id ); $autosave_is_different = false;