From bd5099a40a2103b1d935a77f624d7da752f3713e Mon Sep 17 00:00:00 2001
From: "Dominik Schilling (ocean90)" <ocean90@git.wordpress.org>
Date: Thu, 2 May 2013 09:35:35 +0000
Subject: [PATCH] Revisions: Remove the ID from the "restored by" line. props
 adamsilverstein. see #18733.

git-svn-id: https://develop.svn.wordpress.org/trunk@24156 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/css/wp-admin.css     |  3 ++-
 wp-includes/post-template.php | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css
index c6a6cc0b59..2f58d33864 100644
--- a/wp-admin/css/wp-admin.css
+++ b/wp-admin/css/wp-admin.css
@@ -3531,7 +3531,8 @@ td.plugin-title p {
 ------------------------------------------------------------------------------*/
 
 /* Revision meta box */
-.post-revisions li img {
+.post-revisions li img,
+#revisions-meta-restored img {
 	vertical-align: middle;
 }
 
diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index 8380240f68..c0c68c9503 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -1475,26 +1475,26 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) {
 		echo "<ul class='post-revisions'>\n";
 		echo $rows;
 
-		//
 		// if the post was previously restored from a revision
 		// show the restore event details
-		//
 		if ( $restored_from_meta = get_post_meta( $post->ID, '_post_restored_from', true ) ) {
-			$author = get_the_author_meta( 'display_name', $restored_from_meta[ 'restored_by_user' ] );
+			$author = get_user_by( 'id', $restored_from_meta[ 'restored_by_user' ] );
 			/* translators: revision date format, see http://php.net/date */
 			$datef = _x( 'j F, Y @ G:i:s', 'revision date format');
 			$date = date_i18n( $datef, strtotime( $restored_from_meta[ 'restored_time' ] ) );
-			$timesince = human_time_diff( $restored_from_meta[ 'restored_time' ], current_time( 'timestamp' ) ) ;
+			$time_diff = human_time_diff( $restored_from_meta[ 'restored_time' ] ) ;
 			?>
 			<hr />
 			<div id="revisions-meta-restored">
 				<?php
-				/* translators: restored revision details: 1: revision ID, 2: time ago, 3: author name, 4: date */
-				printf( _x( 'Previously restored from revision ID %1$d, %2$s ago by %3$s (%4$s)', 'restored revision details' ),
-				$restored_from_meta[ 'restored_revision_id'],
-				$timesince,
-				$author,
-				$date );
+				printf(
+					/* translators: restored revision details: 1: gravatar image, 2: author name, 3: time ago, 4: date */
+					__( 'Previously restored by %1$s %2$s, %3$s ago (%4$s)' ),
+					get_avatar( $author->ID, 24 ),
+					$author->display_name,
+					$time_diff,
+					$date
+				);
 				?>
 			</div>
 			<?php