Ticket #20564: 20564.4.diff

wp-includes/post.php

@@ -1667 +1667 @@
  * @return bool False for failure. True for success.
  */
 function add_post_meta($post_id, $meta_key, $meta_value, $unique = false) {
-        // make sure meta is added to the post, not a revision
-        if ( $the_post = wp_is_post_revision($post_id) )
+        // make sure meta is added to the post, not a revision, unless the key is revisioned
+        if ( $the_post = wp_is_post_revision( $post_id ) && ! in_array( $meta_key, _wp_post_revision_meta_keys() ) )
                 $post_id = $the_post;
 
         return add_metadata('post', $post_id, $meta_key, $meta_value, $unique);
@@ -1691 +1691 @@
  * @return bool False for failure. True for success.
  */
 function delete_post_meta($post_id, $meta_key, $meta_value = '') {
-        // make sure meta is added to the post, not a revision
-        if ( $the_post = wp_is_post_revision($post_id) )
+        // make sure meta is deleted from the post, not the revision, unless the key is revisioned
+        if ( $the_post = wp_is_post_revision( $post_id ) && ! in_array( $meta_key, _wp_post_revision_meta_keys() ) )
                 $post_id = $the_post;
 
         return delete_metadata('post', $post_id, $meta_key, $meta_value);
@@ -1734 +1734 @@
  * @return bool False on failure, true if success.
  */
 function update_post_meta($post_id, $meta_key, $meta_value, $prev_value = '') {
-        // make sure meta is added to the post, not a revision
-        if ( $the_post = wp_is_post_revision($post_id) )
+        // make sure meta is updated on the post, not a revision, unless the key is revisioned
+        if ( $the_post = wp_is_post_revision( $post_id ) && ! in_array( $meta_key, _wp_post_revision_meta_keys() ) )
                 $post_id = $the_post;
 
         return update_metadata('post', $post_id, $meta_key, $meta_value, $prev_value);

wp-includes/revision.php

@@ -61 +61 @@
 }
 
 /**
+ * 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.
@@ -113 +133 @@
                                 }
                         }
 
+                        // 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;
+                                }
+                        }
+
                         //don't save revision if post unchanged
                         if( ! $post_has_changed )
                                 return;
@@ -240 +268 @@
         if ( isset($post['post_type']) && 'revision' == $post['post_type'] )
                 return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
 
+        $post_id = $post['ID'];
         $post = _wp_post_revision_fields( $post, $autosave );
         $post = wp_slash($post); //since data is from db
 
@@ -250 +279 @@
         if ( $revision_id )
                 do_action( '_wp_put_post_revision', $revision_id );
 
+        // Save revisioned meta fields.
+        foreach ( _wp_post_revision_meta_keys() as $meta_key ) {
+                $meta_values = get_post_meta( $post_id, $meta_key );
+                if ( false === $meta_values )
+                        continue;
+
+                foreach ( $meta_values as $meta_value )
+                        add_post_meta( $revision_id, $meta_key, $meta_value );
+        }
+
         return $revision_id;
 }
 
@@ -324 +363 @@
 
         $update = wp_slash( $update ); //since data is from db
 
+        // 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 ( is_wp_error( $post_id ) )
                 return $post_id;