Ticket #20564: 20564.5.patch

wp-includes/post.php

@@ -1755 +1755 @@
 }
 
 /**
+ * Add versioned meta data field to a post or revision.
+ *
+ * Post meta data is called "Custom Fields" on the Administration Screen.
+ *
+ * @since 3.6.0
+ * @uses $wpdb
+ * @link http://codex.wordpress.org/Function_Reference/add_versioned_meta
+ *
+ * @param int $post_id Post or Revision ID.
+ * @param string $meta_key Metadata name.
+ * @param mixed $meta_value Metadata value.
+ * @param bool $unique Optional, default is false. Whether the same key should not be added.
+ * @return bool False for failure. True for success.
+ */
+function add_versioned_meta($post_id, $meta_key, $meta_value, $unique = false) {
+        return add_metadata('post', $post_id, $meta_key, $meta_value, $unique);
+}
+
+/**
+ * Remove versioned metadata matching criteria from a post or revision.
+ *
+ * You can match based on the key, or key and value. Removing based on key and
+ * value, will keep from removing duplicate metadata with the same key. It also
+ * allows removing all metadata matching key, if needed.
+ *
+ * @since 3.6.0
+ * @uses $wpdb
+ * @link http://codex.wordpress.org/Function_Reference/delete_versioned_meta
+ *
+ * @param int $post_id Post or Revision ID
+ * @param string $meta_key Metadata name.
+ * @param mixed $meta_value Optional. Metadata value.
+ * @return bool False for failure. True for success.
+ */
+function delete_versioned_meta($post_id, $meta_key, $meta_value = '') {
+        return delete_metadata('post', $post_id, $meta_key, $meta_value);
+}
+
+/**
+ * Update versioned post meta field based on post or revision.
+ *
+ * Use the $prev_value parameter to differentiate between meta fields with the
+ * same key and post revision ID.
+ *
+ * If the meta field for the post or revision does not exist, it will be added.
+ *
+ * @since 3.6.0
+ * @uses $wpdb
+ * @link http://codex.wordpress.org/Function_Reference/update_versioned_meta
+ *
+ * @param int $post_id Post or Revision ID.
+ * @param string $meta_key Metadata key.
+ * @param mixed $meta_value Metadata value.
+ * @param mixed $prev_value Optional. Previous value to check before removing.
+ * @return bool False on failure, true if success.
+ */
+function update_versioned_meta($post_id, $meta_key, $meta_value, $prev_value = '') {
+        return update_metadata('post', $post_id, $meta_key, $meta_value, $prev_value);
+}
+
+/**
  * Retrieve post meta fields, based on post ID.
  *
  * The post meta fields are retrieved from the cache where possible,

wp-includes/revision.php

@@ -298 +298 @@
  * Restores a post to the specified revision.
  *
  * Can restore a past revision using all fields of the post revision, or only selected fields.
+ * Since 3.6 also uses versioned meta data.
  *
  * @package WordPress
  * @subpackage Post_Revisions
@@ -305 +306 @@
  *
  * @uses wp_get_post_revision()
  * @uses wp_update_post()
+ * @uses get_versioned_meta_keys()
  * @uses do_action() Calls 'wp_restore_post_revision' on post ID and revision ID if wp_update_post()
  *  is successful.
  *
@@ -335 +337 @@
         if ( is_wp_error( $post_id ) )
                 return $post_id;
 
+        // Handle versioned meta data
+        foreach ( get_versioned_meta_keys() as $key ) {
+                $meta = get_post_meta( $revision_id, $key );
+                delete_post_meta( $post_id, $key );
+                if ( ! empty( $meta ) ) {
+                        $unique = 1 == count( $meta ) ? true : false;
+                        foreach ( $meta as $value )
+                                add_post_meta( $post_id, $key, $value, $unique ); 
+                }
+        }
+
         if ( $post_id )
                 do_action( 'wp_restore_post_revision', $post_id, $revision['ID'] );
 
@@ -349 +362 @@
 }
 
 /**
+ * Gets array of meta keys that should be versioned.
+ *
+ * @package WordPress
+ * @subpackage Post_Revisions
+ * @since 3.6.0
+ *
+ * @uses apply_filters() Calls 'versioned_meta' on Core's list of versioned meta.
+ *
+ * @return array Versioned meta keys.
+ */
+function get_versioned_meta_keys() {
+        $versioned_meta = array(); // WordPress Core's versioned meta
+        return apply_filters( 'versioned_meta', $versioned_meta );
+}
+
+/**
  * Deletes a revision.
  *
  * Deletes the row from the posts table corresponding to the specified revision.
@@ -706 +735 @@
         $r .= "</table>";
 
         return array( 'html' => $r, 'linesadded' => $linesadded, 'linesdeleted' => $linesdeleted );
-        }
+}