Changeset 23859 for trunk/wp-includes/revision.php

Timestamp:

03/29/2013 10:37:44 AM (12 years ago)

Author:

markjaquith

Message:

Revision our post format postmeta.

props kovshenin, WraithKenny. see #20564.

File:

• trunk/wp-includes/revision.php (modified) (5 diffs)

trunk/wp-includes/revision.php

@@ -59 +59 @@
 
     return $return;
+}
+
+/**
+ * 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() {
+    return array(
+        '_wp_format_url',
+        '_wp_format_quote',
+        '_wp_format_quote_source',
+        '_wp_format_image',
+        '_wp_format_gallery',
+        '_wp_format_audio',
+        '_wp_format_video',
+    );
 }
 
@@ -114 +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 )
@@ -241 +268 @@
         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 +278 @@
     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;
+
+        // 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 );
+    }
 
     return $revision_id;
@@ -324 +364 @@
 
     $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 );