enmi-conf.org: comparison wp/wp-admin/includes/revision.php

equal deleted inserted replaced

-:490d5cc509ed
+:cf61fcea0001
 /**
 * WordPress Administration Revisions API
 *
 * @package WordPress
 * @subpackage Administration
+* @since 3.6.0
 */
 /**
 * Get the revision UI diff.
 *
 	if ( empty( $compare_to->post_title ) )
 		$compare_to->post_title = __( '(no title)' );
 	$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.
 		 *
 		 * The dynamic portion of the hook name, `$field`, corresponds to each of the post
 		 * fields of the revision object being iterated over in a foreach statement.
 		 * @param string  $field                The current revision field.
 		 * @param WP_Post $compare_from         The revision post object to compare to or from.
 		 * @param string  null                  The context of whether the current revision is the old
 		 *                                      or the new one. Values are 'to' or 'from'.
 		 */
-		$content_from = $compare_from ? apply_filters( "_wp_post_revision_field_$field", $compare_from->$field, $field, $compare_from, 'from' ) : '';
+		$content_from = $compare_from ? apply_filters( "_wp_post_revision_field_{$field}", $compare_from->$field, $field, $compare_from, 'from' ) : '';
 		/** This filter is documented in wp-admin/includes/revision.php */
-		$content_to = apply_filters( "_wp_post_revision_field_$field", $compare_to->$field, $field, $compare_to, 'to' );
+		$content_to = apply_filters( "_wp_post_revision_field_{$field}", $compare_to->$field, $field, $compare_to, 'to' );
 		$args = array(
 			'show_split_view' => true
 		);
 		/**
-		 * Filter revisions text diff options.
+		 * Filters revisions text diff options.
 		 *
-		 * Filter the options passed to {@see wp_text_diff()} when viewing a post revision.
+		 * Filters the options passed to wp_text_diff() when viewing a post revision.
 		 *
 		 * @since 4.1.0
 		 *
 		 * @param array   $args {
-		 *     Associative array of options to pass to {@see wp_text_diff()}.
+		 *     Associative array of options to pass to wp_text_diff().
 		 *
 		 *     @type bool $show_split_view True for split view (two columns), false for
 		 *                                 un-split view (single column). Default true.
 		 * }
 		 * @param string  $field        The current revision field.
 			);
 		}
 	}
 	/**
-	 * Filter the fields displayed in the post revision diff UI.
+	 * Filters the fields displayed in the post revision diff UI.
 	 *
 	 * @since 4.1.0
 	 *
 	 * @param array   $return       Revision UI fields. Each item is an array of id, name and diff.
 	 * @param WP_Post $compare_from The revision post to compare from.
 	$can_restore = current_user_can( 'edit_post', $post->ID );
 	$current_id = false;
 	foreach ( $revisions as $revision ) {
 		$modified = strtotime( $revision->post_modified );
-		$modified_gmt = strtotime( $revision->post_modified_gmt );
+		$modified_gmt = strtotime( $revision->post_modified_gmt . ' +0000' );
 		if ( $can_restore ) {
 			$restore_link = str_replace( '&amp;', '&', wp_nonce_url(
 				add_query_arg(
 					array( 'revision' => $revision->ID,
 						'action' => 'restore' ),
 			}
 		} elseif ( $current ) {
 			$current_id = $revision->ID;
 		}
-		$revisions[ $revision->ID ] = array(
+		$revisions_data = array(
 			'id'         => $revision->ID,
 			'title'      => get_the_title( $post->ID ),
 			'author'     => $authors[ $revision->post_author ],
 			'date'       => date_i18n( __( 'M j, Y @ H:i' ), $modified ),
 			'dateShort'  => date_i18n( _x( 'j M @ H:i', 'revision date short format' ), $modified ),
 			'timeAgo'    => sprintf( __( '%s ago' ), human_time_diff( $modified_gmt, $now_gmt ) ),
 			'autosave'   => $autosave,
 			'current'    => $current,
 			'restoreUrl' => $can_restore ? $restore_link : false,
 		);
+		/**
+		 * Filters the array of revisions used on the revisions screen.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param array   $revisions_data {
+		 *     The bootstrapped data for the revisions screen.
+		 *
+		 *     @type int        $id         Revision ID.
+		 *     @type string     $title      Title for the revision's parent WP_Post object.
+		 *     @type int        $author     Revision post author ID.
+		 *     @type string     $date       Date the revision was modified.
+		 *     @type string     $dateShort  Short-form version of the date the revision was modified.
+		 *     @type string     $timeAgo    GMT-aware amount of time ago the revision was modified.
+		 *     @type bool       $autosave   Whether the revision is an autosave.
+		 *     @type bool       $current    Whether the revision is both not an autosave and the post
+		 *                                  modified date matches the revision modified date (GMT-aware).
+		 *     @type bool|false $restoreUrl URL if the revision can be restored, false otherwise.
+		 * }
+		 * @param WP_Post $revision       The revision's WP_Post object.
+		 * @param WP_Post $post           The revision's parent WP_Post object.
+		 */
+		$revisions[ $revision->ID ] = apply_filters( 'wp_prepare_revision_for_js', $revisions_data, $revision, $post );
 	}
 	/**
 	 * If we only have one revision, the initial revision is missing; This happens
 	 * when we have an autsosave and the user has clicked 'View the Autosave'
 				if ( 'undefined' !== typeof data && data.model.attributes.compareTwoMode ) {
 					#> checked="checked"<#
 				}
 				#>
 				/>
-				<?php esc_attr_e( 'Compare any two revisions' ); ?>
+				<?php esc_html_e( 'Compare any two revisions' ); ?>
 			</label>
 		</div>
 	</script>
 	<script id="tmpl-revisions-meta" type="text/html">

changeset 7	cf61fcea0001
parent 5	5e2f62d02dcd
child 9	177826044cd9