2013-06-26 23:06:50 +02:00
|
|
|
<?php
|
2013-07-17 22:39:35 +02:00
|
|
|
/**
|
|
|
|
* WordPress Administration Revisions API.
|
|
|
|
*
|
|
|
|
* @package WordPress
|
|
|
|
* @subpackage Administration
|
|
|
|
*/
|
2013-06-26 23:06:50 +02:00
|
|
|
|
2013-07-17 22:39:35 +02:00
|
|
|
/**
|
|
|
|
* Get the revision UI diff.
|
|
|
|
*
|
|
|
|
* @param object $post The post object.
|
|
|
|
* @param int $compare_from The revision id to compare from.
|
|
|
|
* @param int $compare_to The revision id to come to.
|
|
|
|
*
|
|
|
|
* @return array|bool Associative array of a post's revisioned fields and their diffs.
|
|
|
|
* Or, false on failure.
|
|
|
|
*/
|
2013-06-26 23:06:50 +02:00
|
|
|
function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) {
|
|
|
|
if ( ! $post = get_post( $post ) )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if ( $compare_from ) {
|
|
|
|
if ( ! $compare_from = get_post( $compare_from ) )
|
|
|
|
return false;
|
|
|
|
} else {
|
|
|
|
// If we're dealing with the first revision...
|
|
|
|
$compare_from = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( ! $compare_to = get_post( $compare_to ) )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// If comparing revisions, make sure we're dealing with the right post parent.
|
|
|
|
if ( $compare_from && $compare_from->post_parent !== $post->ID )
|
|
|
|
return false;
|
|
|
|
if ( $compare_to->post_parent !== $post->ID )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if ( $compare_from && strtotime( $compare_from->post_date_gmt ) > strtotime( $compare_to->post_date_gmt ) ) {
|
|
|
|
$temp = $compare_from;
|
|
|
|
$compare_from = $compare_to;
|
|
|
|
$compare_to = $temp;
|
|
|
|
}
|
|
|
|
|
2013-07-06 12:48:14 +02:00
|
|
|
// Add default title if title field is empty
|
|
|
|
if ( $compare_from && empty( $compare_from->post_title ) )
|
|
|
|
$compare_from->post_title = __( '(no title)' );
|
|
|
|
if ( empty( $compare_to->post_title ) )
|
|
|
|
$compare_to->post_title = __( '(no title)' );
|
|
|
|
|
2013-06-26 23:06:50 +02:00
|
|
|
$return = array();
|
|
|
|
|
|
|
|
foreach ( _wp_post_revision_fields() as $field => $name ) {
|
|
|
|
$content_from = $compare_from ? apply_filters( "_wp_post_revision_field_$field", $compare_from->$field, $field, $compare_from, 'left' ) : '';
|
|
|
|
$content_to = apply_filters( "_wp_post_revision_field_$field", $compare_to->$field, $field, $compare_to, 'right' );
|
|
|
|
|
|
|
|
$diff = wp_text_diff( $content_from, $content_to, array( 'show_split_view' => true ) );
|
|
|
|
|
|
|
|
if ( ! $diff && 'post_title' === $field ) {
|
|
|
|
// It's a better user experience to still show the Title, even if it didn't change.
|
|
|
|
// No, you didn't see this.
|
2013-06-29 19:45:02 +02:00
|
|
|
$diff = '<table class="diff"><colgroup><col class="content diffsplit left"><col class="content diffsplit middle"><col class="content diffsplit right"></colgroup><tbody><tr>';
|
2013-06-26 23:06:50 +02:00
|
|
|
$diff .= '<td>' . esc_html( $compare_from->post_title ) . '</td><td></td><td>' . esc_html( $compare_to->post_title ) . '</td>';
|
|
|
|
$diff .= '</tr></tbody>';
|
|
|
|
$diff .= '</table>';
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( $diff ) {
|
|
|
|
$return[] = array(
|
|
|
|
'id' => $field,
|
|
|
|
'name' => $name,
|
|
|
|
'diff' => $diff,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return $return;
|
|
|
|
}
|
|
|
|
|
2013-07-17 22:39:35 +02:00
|
|
|
/**
|
|
|
|
* Prepare revisions for JavaScript.
|
|
|
|
*
|
|
|
|
* @param object $post The post object.
|
|
|
|
* @param int $selected_revision_id The selected revision id.
|
|
|
|
* @param int $from (optional) The revision id to compare from.
|
|
|
|
*
|
2013-07-17 23:09:14 +02:00
|
|
|
* @return array An associative array of revision data and related settings.
|
2013-07-17 22:39:35 +02:00
|
|
|
*/
|
2013-07-12 00:56:48 +02:00
|
|
|
function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null ) {
|
2013-06-26 23:06:50 +02:00
|
|
|
$post = get_post( $post );
|
2013-07-16 01:01:27 +02:00
|
|
|
$revisions = $authors = array();
|
2013-07-11 22:57:47 +02:00
|
|
|
$now_gmt = time();
|
2013-06-26 23:06:50 +02:00
|
|
|
|
2013-07-12 07:41:39 +02:00
|
|
|
$revisions = wp_get_post_revisions( $post->ID, array( 'order' => 'ASC' ) );
|
2013-07-16 01:01:27 +02:00
|
|
|
$show_avatars = get_option( 'show_avatars' );
|
2013-06-26 23:06:50 +02:00
|
|
|
|
|
|
|
cache_users( wp_list_pluck( $revisions, 'post_author' ) );
|
|
|
|
|
|
|
|
foreach ( $revisions as $revision ) {
|
2013-07-12 07:11:56 +02:00
|
|
|
$modified = strtotime( $revision->post_modified );
|
2013-06-26 23:06:50 +02:00
|
|
|
$modified_gmt = strtotime( $revision->post_modified_gmt );
|
Revisions: Pinned controls, layout tweaks, copy tweaks, misc.
* When you scroll down the diff view, the controls will pin to the top.
* The revisions meta view was cleaned up. Copy changes.
* Loading indicator in the center of the screen (so it follows as you scroll).
* Tooltips "flip" when you cross the center line, so that they don't hit the container edge and wrap for later revisions.
* The "Restore" button's inactive state is handled on render, instead of after.
* Make sure we always have a current revision, even if the timestamp doesn't work out on the most recent one.
See #24804. Props markjaquith, nacin, ocean90, aaroncampbell.
git-svn-id: https://develop.svn.wordpress.org/trunk@24761 602fd350-edb4-49c9-b593-d223f7449a82
2013-07-22 07:05:45 +02:00
|
|
|
$restore_link = str_replace( '&', '&', wp_nonce_url(
|
2013-06-26 23:06:50 +02:00
|
|
|
add_query_arg(
|
|
|
|
array( 'revision' => $revision->ID,
|
|
|
|
'action' => 'restore' ),
|
|
|
|
admin_url( 'revision.php' )
|
|
|
|
),
|
|
|
|
"restore-post_{$revision->ID}"
|
Revisions: Pinned controls, layout tweaks, copy tweaks, misc.
* When you scroll down the diff view, the controls will pin to the top.
* The revisions meta view was cleaned up. Copy changes.
* Loading indicator in the center of the screen (so it follows as you scroll).
* Tooltips "flip" when you cross the center line, so that they don't hit the container edge and wrap for later revisions.
* The "Restore" button's inactive state is handled on render, instead of after.
* Make sure we always have a current revision, even if the timestamp doesn't work out on the most recent one.
See #24804. Props markjaquith, nacin, ocean90, aaroncampbell.
git-svn-id: https://develop.svn.wordpress.org/trunk@24761 602fd350-edb4-49c9-b593-d223f7449a82
2013-07-22 07:05:45 +02:00
|
|
|
) );
|
2013-07-16 01:01:27 +02:00
|
|
|
|
|
|
|
if ( ! isset( $authors[ $revision->post_author ] ) ) {
|
|
|
|
$authors[ $revision->post_author ] = array(
|
|
|
|
'id' => (int) $revision->post_author,
|
Revisions: Pinned controls, layout tweaks, copy tweaks, misc.
* When you scroll down the diff view, the controls will pin to the top.
* The revisions meta view was cleaned up. Copy changes.
* Loading indicator in the center of the screen (so it follows as you scroll).
* Tooltips "flip" when you cross the center line, so that they don't hit the container edge and wrap for later revisions.
* The "Restore" button's inactive state is handled on render, instead of after.
* Make sure we always have a current revision, even if the timestamp doesn't work out on the most recent one.
See #24804. Props markjaquith, nacin, ocean90, aaroncampbell.
git-svn-id: https://develop.svn.wordpress.org/trunk@24761 602fd350-edb4-49c9-b593-d223f7449a82
2013-07-22 07:05:45 +02:00
|
|
|
'avatar' => $show_avatars ? get_avatar( $revision->post_author, 32 ) : '',
|
2013-07-16 01:01:27 +02:00
|
|
|
'name' => get_the_author_meta( 'display_name', $revision->post_author ),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2013-07-18 16:10:33 +02:00
|
|
|
$autosave = wp_is_post_autosave( $revision );
|
|
|
|
$current = ! $autosave && $revision->post_modified_gmt === $post->post_modified_gmt;
|
|
|
|
if ( $current && ! empty( $current_id ) ) {
|
|
|
|
if ( $current_id < $revision->ID ) {
|
|
|
|
$revisions[ $current_id ]['current'] = false;
|
|
|
|
$current_id = $revision->ID;
|
|
|
|
} else {
|
|
|
|
$current = false;
|
|
|
|
}
|
|
|
|
} elseif ( $current ) {
|
|
|
|
$current_id = $revision->ID;
|
|
|
|
}
|
|
|
|
|
2013-06-26 23:06:50 +02:00
|
|
|
$revisions[ $revision->ID ] = array(
|
2013-07-16 01:01:27 +02:00
|
|
|
'id' => $revision->ID,
|
|
|
|
'title' => get_the_title( $post->ID ),
|
|
|
|
'author' => $authors[ $revision->post_author ],
|
|
|
|
'date' => date_i18n( __( 'M j, Y @ G:i' ), $modified ),
|
|
|
|
'dateShort' => date_i18n( _x( 'j M @ G:i', 'revision date short format' ), $modified ),
|
|
|
|
'timeAgo' => sprintf( __( '%s ago' ), human_time_diff( $modified_gmt, $now_gmt ) ),
|
2013-07-18 16:10:33 +02:00
|
|
|
'autosave' => $autosave,
|
|
|
|
'current' => $current,
|
2013-07-16 01:01:27 +02:00
|
|
|
'restoreUrl' => urldecode( $restore_link ),
|
2013-06-26 23:06:50 +02:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
Revisions: Pinned controls, layout tweaks, copy tweaks, misc.
* When you scroll down the diff view, the controls will pin to the top.
* The revisions meta view was cleaned up. Copy changes.
* Loading indicator in the center of the screen (so it follows as you scroll).
* Tooltips "flip" when you cross the center line, so that they don't hit the container edge and wrap for later revisions.
* The "Restore" button's inactive state is handled on render, instead of after.
* Make sure we always have a current revision, even if the timestamp doesn't work out on the most recent one.
See #24804. Props markjaquith, nacin, ocean90, aaroncampbell.
git-svn-id: https://develop.svn.wordpress.org/trunk@24761 602fd350-edb4-49c9-b593-d223f7449a82
2013-07-22 07:05:45 +02:00
|
|
|
// If a post has been saved since the last revision (no revisioned fields were changed)
|
|
|
|
// we may not have a "current" revision. Mark the latest revision as "current".
|
|
|
|
if ( empty( $current_id ) )
|
|
|
|
$revisions[ $revision->ID ]['current'] = true;
|
|
|
|
|
2013-07-12 00:56:48 +02:00
|
|
|
// Now, grab the initial diff
|
2013-07-12 16:01:39 +02:00
|
|
|
$compare_two_mode = is_numeric( $from );
|
|
|
|
if ( ! $compare_two_mode ) {
|
2013-07-12 09:26:11 +02:00
|
|
|
$from = array_keys( array_slice( $revisions, array_search( $selected_revision_id, array_keys( $revisions ) ) - 1, 1, true ) );
|
|
|
|
$from = $from[0];
|
2013-07-12 16:01:39 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
$from = absint( $from );
|
2013-07-12 07:11:56 +02:00
|
|
|
|
2013-07-12 00:56:48 +02:00
|
|
|
$diffs = array( array(
|
2013-07-12 07:11:56 +02:00
|
|
|
'id' => $from . ':' . $selected_revision_id,
|
|
|
|
'fields' => wp_get_revision_ui_diff( $post->ID, $from, $selected_revision_id ),
|
2013-07-12 00:56:48 +02:00
|
|
|
));
|
|
|
|
|
2013-06-26 23:06:50 +02:00
|
|
|
return array(
|
|
|
|
'postId' => $post->ID,
|
|
|
|
'nonce' => wp_create_nonce( 'revisions-ajax-nonce' ),
|
|
|
|
'revisionData' => array_values( $revisions ),
|
2013-07-12 00:56:48 +02:00
|
|
|
'to' => $selected_revision_id,
|
|
|
|
'from' => $from,
|
|
|
|
'diffData' => $diffs,
|
|
|
|
'baseUrl' => parse_url( admin_url( 'revision.php' ), PHP_URL_PATH ),
|
|
|
|
'compareTwoMode' => absint( $compare_two_mode ), // Apparently booleans are not allowed
|
2013-07-12 07:11:56 +02:00
|
|
|
'revisionIds' => array_keys( $revisions ),
|
2013-06-26 23:06:50 +02:00
|
|
|
);
|
2013-06-29 19:45:02 +02:00
|
|
|
}
|