Index: wp-includes/post-template.php =================================================================== --- wp-includes/post-template.php (revision 23415) +++ wp-includes/post-template.php (working copy) @@ -1301,15 +1301,17 @@ return false; /* translators: revision date format, see http://php.net/date */ - $datef = _x( 'j F, Y @ G:i', 'revision date format'); + $datef = _x( 'D, M jS @ G:i a', 'revision date format' ); /* translators: 1: date */ $autosavef = __( '%1$s [Autosave]' ); /* translators: 1: date */ $currentf = __( '%1$s [Current Revision]' ); + $author = get_the_author_meta( 'display_name', $revision->post_author ); + $date = date_i18n( $datef, strtotime( $revision->post_modified ) ); if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) ) - $date = "$date"; + $date = "$author : $date"; if ( !wp_is_post_revision( $revision ) ) $date = sprintf( $currentf, $date ); @@ -1386,64 +1388,44 @@ continue; $date = wp_post_revision_title( $revision ); - $name = get_the_author_meta( 'display_name', $revision->post_author ); + $datelinktodiff = sprintf( '%s', + $revision->ID, $post->ID, wp_post_revision_title( $revision, false ) ); + $name = ''; + $avatar = get_avatar( $revision->post_author, 22 ); if ( 'form-table' == $format ) { - if ( $left ) - $left_checked = $left == $revision->ID ? ' checked="checked"' : ''; - else - $left_checked = $right_checked ? ' checked="checked"' : ''; // [sic] (the next one) - $right_checked = $right == $revision->ID ? ' checked="checked"' : ''; $class = $class ? '' : " class='alternate'"; if ( $post->ID != $revision->ID && $can_edit_post ) - $actions = 'ID|$revision->ID" ) . '">' . __( 'Restore' ) . ''; + $actions = '';// 'ID|$revision->ID" ) . '">' . __( 'Restore' ) . ''; else $actions = ''; $rows .= "\n"; - $rows .= "\t\n"; - $rows .= "\t\n"; - $rows .= "\t$date\n"; - $rows .= "\t$name\n"; - $rows .= "\t$actions\n"; + $rows .= "\t\n"; + $rows .= "\t$avatar $date\n"; $rows .= "\n"; } else { - $title = sprintf( $titlef, $date, $name ); + $title = sprintf( $titlef, $datelinktodiff, $name ); $rows .= "\t
  • $title
    • \n"; } } if ( 'form-table' == $format ) : ?> - -
    - +
    -
    - +
    +
    +
    -
    - - - - - - - - - - - - - - + Index: wp-includes/js/wp-list-revisions.js =================================================================== --- wp-includes/js/wp-list-revisions.js (revision 23415) +++ wp-includes/js/wp-list-revisions.js (working copy) @@ -6,14 +6,12 @@ var i, checkCount = 0, side; for ( i = 0; i < inputs.length; i++ ) { checkCount += inputs[i].checked ? 1 : 0; - side = inputs[i].getAttribute('name'); - if ( ! inputs[i].checked && - ( 'left' == side && 1 > checkCount || 'right' == side && 1 < checkCount && ( ! inputs[i-1] || ! inputs[i-1].checked ) ) && - ! ( inputs[i+1] && inputs[i+1].checked && 'right' == inputs[i+1].getAttribute('name') ) ) - inputs[i].style.visibility = 'hidden'; - else if ( 'left' == side || 'right' == side ) - inputs[i].style.visibility = 'visible'; } + + if ( 2 == checkCount ) { + document.getElementById('revision-list-form').submit(); + } + } pr.onclick(); } Index: wp-includes/wp-diff.php =================================================================== --- wp-includes/wp-diff.php (revision 23415) +++ wp-includes/wp-diff.php (working copy) @@ -98,7 +98,7 @@ * @return string */ function addedLine( $line ) { - return ""; + return ""; } /** @@ -108,7 +108,7 @@ * @return string */ function deletedLine( $line ) { - return ""; + return ""; } /** @@ -118,7 +118,7 @@ * @return string */ function contextLine( $line ) { - return ""; + return ""; } /** @@ -127,7 +127,7 @@ * @return string */ function emptyLine() { - return ''; + return ''; } /** @@ -142,8 +142,8 @@ $r = ''; foreach ($lines as $line) { if ( $encode ) - $line = htmlspecialchars( $line ); - $r .= '' . $this->emptyLine() . $this->addedLine( $line ) . "\n"; + $line = wp_kses_post( $line ); + $r .= '' . $this->addedLine( $line ) . "\n"; } return $r; } @@ -160,8 +160,8 @@ $r = ''; foreach ($lines as $line) { if ( $encode ) - $line = htmlspecialchars( $line ); - $r .= '' . $this->deletedLine( $line ) . $this->emptyLine() . "\n"; + $line = wp_kses_post( $line ); + $r .= '' . $this->deletedLine( $line ) . "\n"; } return $r; } @@ -178,9 +178,9 @@ $r = ''; foreach ($lines as $line) { if ( $encode ) - $line = htmlspecialchars( $line ); + $line = wp_kses_post( $line ); $r .= '' . - $this->contextLine( $line ) . $this->contextLine( $line ) . "\n"; + $this->contextLine( $line ) . $this->emptyLine() . "\n"; } return $r; } @@ -248,14 +248,14 @@ if ( isset( $orig_diffs[$orig_rows[$row]] ) ) $orig_line = $orig_diffs[$orig_rows[$row]]; elseif ( isset( $orig[$orig_rows[$row]] ) ) - $orig_line = htmlspecialchars($orig[$orig_rows[$row]]); + $orig_line = wp_kses_post($orig[$orig_rows[$row]]); else $orig_line = ''; if ( isset( $final_diffs[$final_rows[$row]] ) ) $final_line = $final_diffs[$final_rows[$row]]; elseif ( isset( $final[$final_rows[$row]] ) ) - $final_line = htmlspecialchars($final[$final_rows[$row]]); + $final_line = wp_kses_post($final[$final_rows[$row]]); else $final_line = ''; @@ -264,7 +264,7 @@ } elseif ( $final_rows[$row] < 0 ) { // Final is blank. This is really a deleted row. $r .= $this->_deleted( array($orig_line), false ); } else { // A true changed row. - $r .= '' . $this->deletedLine( $orig_line ) . $this->addedLine( $final_line ) . "\n"; + $r .= '' . $this->deletedLine( $orig_line ) . '' . $this->addedLine( $final_line ) . "\n"; } } Index: wp-includes/Text/Diff/Renderer/inline.php =================================================================== --- wp-includes/Text/Diff/Renderer/inline.php (revision 23415) +++ wp-includes/Text/Diff/Renderer/inline.php (working copy) @@ -200,7 +200,7 @@ function _encode(&$string) { - $string = htmlspecialchars($string); + $string = wp_kses_post($string); } } Index: wp-includes/pluggable.php =================================================================== --- wp-includes/pluggable.php (revision 23415) +++ wp-includes/pluggable.php (working copy) @@ -1722,16 +1722,16 @@ return ''; $r = "
    +{$line}
    {$line}
    " . __("Added") . "
    		-{$line}
    {$line}
    " . __( "Removed" ) . "
    		 {$line}
    {$line}
    		  
    \n"; - $r .= ""; + $r .= ""; if ( $args['title'] || $args['title_left'] || $args['title_right'] ) $r .= ""; if ( $args['title'] ) - $r .= "\n"; + $r .= "\n"; if ( $args['title_left'] || $args['title_right'] ) { $r .= "\n"; - $r .= "\t\n"; - $r .= "\t\n"; + $r .= "\t\n"; + $r .= "\t\n"; $r .= "\n"; } if ( $args['title'] || $args['title_left'] || $args['title_right'] ) @@ -1743,3 +1743,47 @@ return $r; } endif; +function wp_text_diff_with_count( $left_string, $right_string, $args = null ) { + $defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' ); + $args = wp_parse_args( $args, $defaults ); + + if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) ) + require( ABSPATH . WPINC . '/wp-diff.php' ); + + $left_string = normalize_whitespace( $left_string ); + $right_string = normalize_whitespace( $right_string ); + + $left_lines = explode( "\n", $left_string ); + $right_lines = explode( "\n", $right_string) ; + + $text_diff = new Text_Diff($left_lines, $right_lines ); + $linesadded = $text_diff->countAddedLines(); + $linesdeleted = $text_diff->countDeletedLines(); + + $renderer = new WP_Text_Diff_Renderer_Table(); + $diff = $renderer->render( $text_diff ); + + if ( !$diff ) + return ''; + + $r = "
    $args[title]
    $args[title]
    $args[title_left]$args[title_right]$args[title_left]$args[title_right]
    \n"; + $r .= ""; + + if ( $args['title'] || $args['title_left'] || $args['title_right'] ) + $r .= ""; + if ( $args['title'] ) + $r .= "\n"; + if ( $args['title_left'] || $args['title_right'] ) { + $r .= "\n"; + $r .= "\t\n"; + $r .= "\t\n"; + $r .= "\n"; + } + if ( $args['title'] || $args['title_left'] || $args['title_right'] ) + $r .= "\n"; + + $r .= "\n$diff\n\n"; + $r .= "
    $args[title]
    $args[title_left]$args[title_right]
    "; + + return array( 'html' => $r, 'linesadded' => $linesadded, 'linesdeleted' => $linesdeleted ); +} \ No newline at end of file Index: wp-admin/revision.php =================================================================== --- wp-admin/revision.php (revision 23415) +++ wp-admin/revision.php (working copy) @@ -11,7 +11,7 @@ wp_enqueue_script('list-revisions'); -wp_reset_vars(array('revision', 'left', 'right', 'action')); +wp_reset_vars( array( 'revision', 'left', 'right', 'action' ) ); $revision_id = absint($revision); $left = absint($left); @@ -19,6 +19,13 @@ $redirect = 'edit.php'; +if ( isset( $_GET['revisionstocompare'] ) ) { + $revisionstocompare = $_GET['revisionstocompare']; + $left = absint( $revisionstocompare[1] ); + $right = absint( $revisionstocompare[0] ); +} + + switch ( $action ) : case 'restore' : if ( !$revision = wp_get_post_revision( $revision_id ) ) @@ -93,7 +100,7 @@ break; $post_title = '' . get_the_title() . ''; - $h2 = sprintf( __( 'Compare Revisions of “%1$s”' ), $post_title ); + $h2 = sprintf( __( 'Comparing revisions of %1$s' ), $post_title ); $title = __( 'Revisions' ); $left = $left_revision->ID; @@ -135,6 +142,7 @@ $redirect = 'edit.php'; if ( !empty($redirect) ) { + $redirect = remove_query_arg( 'revisionstocompare', $redirect ); wp_redirect( $redirect ); exit; } @@ -153,42 +161,68 @@

    - - +
    - $field_title ) : if ( 'diff' == $action ) { $left_content = apply_filters( "_wp_post_revision_field_$field", $left_revision->$field, $field, $left_revision, 'left' ); $right_content = apply_filters( "_wp_post_revision_field_$field", $right_revision->$field, $field, $right_revision, 'right' ); - if ( !$content = wp_text_diff( $left_content, $right_content ) ) + if ( !$content = wp_text_diff_with_count( $left_content, $right_content ) ) continue; // There is no difference between left and right + $htmlcontent = $content[ 'html' ]; + $linesadded += $content[ 'linesadded' ]; + $linesdeleted += $content[ 'linesdeleted' ]; $identical = false; } else { add_filter( "_wp_post_revision_field_$field", 'htmlspecialchars' ); $content = apply_filters( "_wp_post_revision_field_$field", $revision->$field, $field, $revision, '' ); + add_filter( "_wp_post_revision_field_$field", 'wp_kses_post' ); + $htmlcontent = apply_filters( "_wp_post_revision_field_$field", $revision->$field, $field ); } ?> - - + +
    +
    +
    +
    + @@ -202,11 +236,7 @@ ?>
    - - + + + + + +
    + %s
    %s
    %s
    ', + __('Older'), + get_avatar( $left_revision->post_author, 22 ), + wp_post_revision_title( $left_revision ) + ); ?> +     		+ %s
    %s
    %s
    ', + __('Newer'), + wp_post_revision_title( $right_revision ), + get_avatar( $right_revision->post_author, 22 ) + ); ?> +
    - -
    - -

    - +
    'form-table', 'parent' => true, 'right' => $right, 'left' => $left ); @@ -218,6 +248,6 @@ ?>
    - +