Ticket #20564: 20564.6.diff

wp-admin/includes/post.php

@@ -1280 +1280 @@
                 $new_autosave['post_author'] = $post_author;
 
                 // Auto-save revisioned meta fields too.
-                foreach ( _wp_post_revision_meta_keys() as $meta_key ) {
-                        if ( ! isset( $_POST[ $meta_key ] ) )
-                                continue;
+                $revision_meta = array();
+                foreach ( _wp_post_revision_meta_keys() as $meta_key )
+                        $revision_meta[ $meta_key ] = $_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 );
-                        add_metadata( 'post', $new_autosave['ID'], $meta_key, $_POST[ $meta_key ] );
-                }
+                // Use the underlying update_metadata vs update_post_meta to make sure
+                // metadata is added to the revision post and not its parent.
+                if ( ! empty( $revision_meta ) )
+                        update_metadata( 'post', $new_autosave['ID'], '_revision_meta', $revision_meta );
 
                 return wp_update_post( $new_autosave );
         }

wp-includes/revision.php

@@ -133 +133 @@
                         }
 
                         // Check whether revisioned meta fields have changed.
+                        $revision_meta = (array) get_post_meta( $last_revision->ID, '_revision_meta', true );
                         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 ) ) {
+                                if ( isset( $revision_meta[ $meta_key ] ) && get_post_meta( $post->ID, $meta_key ) != $revision_meta[ $meta_key ] ) {
                                         $post_has_changed = true;
                                         break;
                                 }
@@ -279 +280 @@
                 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;
+        $revision_meta = array();
+        foreach ( _wp_post_revision_meta_keys() as $meta_key )
+                $revision_meta[ $meta_key ] = get_post_meta( $post_id, $meta_key );
 
-                // Use the underlying add_metadata vs add_post_meta to make sure
-                // metadata is added to the revision post and not its parent.
-                foreach ( $meta_values as $meta_value )
-                        add_metadata( 'post', $revision_id, $meta_key, $meta_value );
-        }
+        // Use the underlying update_metadata vs update_post_meta to make sure
+        // metadata is added to the revision post and not its parent.
+        if ( ! empty( $revision_meta ) )
+                update_metadata( 'post', $revision_id, '_revision_meta', $revision_meta );
 
         return $revision_id;
 }
@@ -365 +364 @@
         $update = wp_slash( $update ); //since data is from db
 
         // Restore revisioned meta fields.
+        $revision_meta = (array) get_post_meta( $revision['ID'], '_revision_meta', true );
         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 )
+
+                if ( ! isset( $revision_meta[ $meta_key ] ) )
                         continue;
 
-                foreach ( $meta_values as $meta_value )
+                foreach ( $revision_meta[ $meta_key ] as $meta_value )
                         add_post_meta( $update['ID'], $meta_key, $meta_value );
         }
 
@@ -538 +538 @@
         if ( ! is_object( $preview ) )
                 return $value;
 
-        return get_post_meta( $preview->ID, $meta_key, $single );
+        $revision_meta = (array) get_post_meta( $preview->ID, '_revision_meta', true );
+        if ( isset( $revision_meta[ $meta_key ] ) )
+                return $revision_meta[ $meta_key ];
+
+        return '';
 }
 
 function _wp_get_post_revision_version( $revision ) {