Ticket #13382: 13382.diff

wp-admin/edit-form-advanced.php

@@ -178 +178 @@
 
 // Detect if there exists an autosave newer than the post and if that autosave is different than the post
 if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) {
-        foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) {
+        foreach ( _wp_post_revision_fields( $post ) as $autosave_field => $_autosave_field ) {
                 if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {
                         $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>' ), get_edit_post_link( $autosave->ID ) );
                         break;

wp-admin/includes/post.php

@@ -1642 +1642 @@
                 // If the new autosave has the same content as the post, delete the autosave.
                 $post = get_post( $post_id );
                 $autosave_is_different = false;
-                foreach ( array_intersect( array_keys( $new_autosave ), array_keys( _wp_post_revision_fields() ) ) as $field ) {
+                foreach ( array_intersect( array_keys( $new_autosave ), array_keys( _wp_post_revision_fields( $post ) ) ) as $field ) {
                         if ( normalize_whitespace( $new_autosave[ $field ] ) != normalize_whitespace( $post->$field ) ) {
                                 $autosave_is_different = true;
                                 break;

wp-admin/includes/revision.php

@@ -54 +54 @@
 
         $return = array();
 
-        foreach ( _wp_post_revision_fields() as $field => $name ) {
+        foreach ( _wp_post_revision_fields( $post ) as $field => $name ) {
                 /**
                  * Contextually filter a post revision field.
                  *

wp-includes/revision.php

@@ -18 +18 @@
  *
  * @staticvar array $fields
  *
- * @param array $post     Optional. A post array to be processed for insertion as a post revision.
- * @param bool  $autosave Optional. Is the revision an autosave?
+ * @param array|object $post     Optional. A post array, or a WP_Post Object to be processed for insertion as a post revision.
+ * @param bool         $autosave Optional. Is the revision an autosave?
  * @return array Post array ready to be inserted as a post revision or array of fields that can be versioned.
  */
 function _wp_post_revision_fields( $post = null, $autosave = false ) {
         static $fields = null;
 
+        if ( is_object( $post ) ) {
+                $post = get_post( $post, ARRAY_A );
+        }
+
         if ( is_null( $fields ) ) {
                 // Allow these to be versioned
                 $fields = array(
@@ -46 +50 @@
                  *
                  * @param array $fields List of fields to revision. Contains 'post_title',
                  *                      'post_content', and 'post_excerpt' by default.
+                 * @param array $post   A post array being processed for insertion as a post revision.
                  */
-                $fields = apply_filters( '_wp_post_revision_fields', $fields );
+                $fields = apply_filters( '_wp_post_revision_fields', $fields, $post );
 
                 // WP uses these internally either in versioning or elsewhere - they cannot be versioned
                 foreach ( array( 'ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count', 'post_author' ) as $protect )
@@ -127 +132 @@
                 if ( isset( $last_revision ) && apply_filters( 'wp_save_post_revision_check_for_changes', $check_for_changes = true, $last_revision, $post ) ) {
                         $post_has_changed = false;
 
-                        foreach ( array_keys( _wp_post_revision_fields() ) as $field ) {
+                        foreach ( array_keys( _wp_post_revision_fields( $post ) ) as $field ) {
                                 if ( normalize_whitespace( $post->$field ) != normalize_whitespace( $last_revision->$field ) ) {
                                         $post_has_changed = true;
                                         break;
@@ -333 +338 @@
                 return $revision;
 
         if ( !is_array( $fields ) )
-                $fields = array_keys( _wp_post_revision_fields() );
+                $fields = array_keys( _wp_post_revision_fields( $revision ) );
 
         $update = array();
         foreach ( array_intersect( array_keys( $revision ), $fields ) as $field ) {