<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[24156] trunk: Revisions: Remove the ID from the "restored by" line.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24156">24156</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2013-05-02 09:35:35 +0000 (Thu, 02 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revisions: Remove the ID from the "restored by" line. props adamsilverstein. see <a href="http://core.trac.wordpress.org/ticket/18733">#18733</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmincss">trunk/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.css (24155 => 24156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.css 2013-05-01 18:39:56 UTC (rev 24155)
+++ trunk/wp-admin/css/wp-admin.css 2013-05-02 09:35:35 UTC (rev 24156)
</span><span class="lines">@@ -3531,7 +3531,8 @@
</span><span class="cx"> ------------------------------------------------------------------------------*/
</span><span class="cx">
</span><span class="cx"> /* Revision meta box */
</span><del>-.post-revisions li img {
</del><ins>+.post-revisions li img,
+#revisions-meta-restored img {
</ins><span class="cx"> vertical-align: middle;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (24155 => 24156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2013-05-01 18:39:56 UTC (rev 24155)
+++ trunk/wp-includes/post-template.php 2013-05-02 09:35:35 UTC (rev 24156)
</span><span class="lines">@@ -1475,26 +1475,26 @@
</span><span class="cx"> echo "<ul class='post-revisions'>\n";
</span><span class="cx"> echo $rows;
</span><span class="cx">
</span><del>- //
</del><span class="cx"> // if the post was previously restored from a revision
</span><span class="cx"> // show the restore event details
</span><del>- //
</del><span class="cx"> if ( $restored_from_meta = get_post_meta( $post->ID, '_post_restored_from', true ) ) {
</span><del>- $author = get_the_author_meta( 'display_name', $restored_from_meta[ 'restored_by_user' ] );
</del><ins>+ $author = get_user_by( 'id', $restored_from_meta[ 'restored_by_user' ] );
</ins><span class="cx"> /* translators: revision date format, see http://php.net/date */
</span><span class="cx"> $datef = _x( 'j F, Y @ G:i:s', 'revision date format');
</span><span class="cx"> $date = date_i18n( $datef, strtotime( $restored_from_meta[ 'restored_time' ] ) );
</span><del>- $timesince = human_time_diff( $restored_from_meta[ 'restored_time' ], current_time( 'timestamp' ) ) ;
</del><ins>+ $time_diff = human_time_diff( $restored_from_meta[ 'restored_time' ] ) ;
</ins><span class="cx"> ?>
</span><span class="cx"> <hr />
</span><span class="cx"> <div id="revisions-meta-restored">
</span><span class="cx"> <?php
</span><del>- /* 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 );
</del><ins>+ 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
+ );
</ins><span class="cx"> ?>
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>