Changeset 34917

Timestamp:

10/07/2015 09:52:18 PM (9 years ago)

Author:

johnbillion

Message:

Pass the $post parameter to the _wp_post_revision_fields filter. This provides more context to the filter, which allows for different fields to be displayed on the revisions screen depending on the post.

The _wp_post_revision_fields() function now also accepts a WP_Post object (in addition to an array of post fields) to facilitate this change.

Fixes #13382
Props adamsilverstein

Location:

trunk/src

Files:

• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-admin/includes/revision.php (modified) (1 diff)
• wp-includes/revision.php (modified) (4 diffs)

trunk/src/wp-admin/edit-form-advanced.php

@@ -198 +198 @@
 // 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 ) );

trunk/src/wp-admin/includes/post.php

@@ -1657 +1657 @@
         $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;

trunk/src/wp-admin/includes/revision.php

@@ -55 +55 @@
     $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.

trunk/src/wp-includes/revision.php

@@ -15 +15 @@
  *
  * @since 2.6.0
+ * @since 4.4.0 A `WP_Post` object can now be passed to the `$post` parameter.
  * @access private
  *
  * @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|WP_Post $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? Default false.
  * @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 ) ) {
@@ -44 +49 @@
          *
          * @since 2.6.0
+         * @since 4.4.0 The `$post` parameter was added.
          *
          * @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
@@ -128 +135 @@
             $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;
@@ -334 +341 @@
 
     if ( !is_array( $fields ) )
-        $fields = array_keys( _wp_post_revision_fields() );
+        $fields = array_keys( _wp_post_revision_fields( $revision ) );
 
     $update = array();