<!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>[24708] trunk/wp-admin/includes/revision.php: Improvements to output of revisions author data.</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/24708">24708</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-07-15 23:01:27 +0000 (Mon, 15 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improvements to output of revisions author data.
* Do not output "false" if avatars are disabled. props ocean90.
* Cache the author data separately to cut down on calls to `get_the_author_meta()` and `get_avatar()`. props nacin.
Fixes <a href="http://core.trac.wordpress.org/ticket/24743">#24743</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesrevisionphp">trunk/wp-admin/includes/revision.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesrevisionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/revision.php (24707 => 24708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/revision.php 2013-07-15 22:53:48 UTC (rev 24707)
+++ trunk/wp-admin/includes/revision.php 2013-07-15 23:01:27 UTC (rev 24708)
</span><span class="lines">@@ -63,10 +63,11 @@
</span><span class="cx">
</span><span class="cx"> function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null ) {
</span><span class="cx"> $post = get_post( $post );
</span><del>- $revisions = array();
</del><ins>+ $revisions = $authors = array();
</ins><span class="cx"> $now_gmt = time();
</span><span class="cx">
</span><span class="cx"> $revisions = wp_get_post_revisions( $post->ID, array( 'order' => 'ASC' ) );
</span><ins>+ $show_avatars = get_option( 'show_avatars' );
</ins><span class="cx">
</span><span class="cx"> cache_users( wp_list_pluck( $revisions, 'post_author' ) );
</span><span class="cx">
</span><span class="lines">@@ -81,20 +82,25 @@
</span><span class="cx"> ),
</span><span class="cx"> "restore-post_{$revision->ID}"
</span><span class="cx"> );
</span><ins>+
+ if ( ! isset( $authors[ $revision->post_author ] ) ) {
+ $authors[ $revision->post_author ] = array(
+ 'id' => (int) $revision->post_author,
+ 'avatar' => $show_avatars ? get_avatar( $revision->post_author, 24 ) : '',
+ 'name' => get_the_author_meta( 'display_name', $revision->post_author ),
+ );
+ }
+
</ins><span class="cx"> $revisions[ $revision->ID ] = array(
</span><del>- 'id' => $revision->ID,
- 'title' => get_the_title( $post->ID ),
- 'author' => array(
- 'id' => (int) $revision->post_author,
- 'avatar' => get_avatar( $revision->post_author, 24 ),
- 'name' => get_the_author_meta( 'display_name', $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 ) ),
- 'autosave' => wp_is_post_autosave( $revision ),
- 'current' => $revision->post_modified_gmt === $post->post_modified_gmt,
- 'restoreUrl' => urldecode( $restore_link ),
</del><ins>+ '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 ) ),
+ 'autosave' => wp_is_post_autosave( $revision ),
+ 'current' => $revision->post_modified_gmt === $post->post_modified_gmt,
+ 'restoreUrl' => urldecode( $restore_link ),
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>