<!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>[23872] trunk: Make sure the first revision is seen as coming from emptiness, so it can be restored.</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, #logmsg > ol { margin-left: 0; 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/23872">23872</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-03-29 20:50:09 +0000 (Fri, 29 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure the first revision is seen as coming from emptiness, so it can be restored.
props adamsilverstein. fixes <a href="http://core.trac.wordpress.org/ticket/23898">#23898</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesajaxactionsphp">trunk/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunkwpadminjsrevisionsjs">trunk/wp-admin/js/revisions.js</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ajax-actions.php (23871 => 23872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php 2013-03-29 20:39:54 UTC (rev 23871)
+++ trunk/wp-admin/includes/ajax-actions.php 2013-03-29 20:50:09 UTC (rev 23872)
</span><span class="lines">@@ -2130,6 +2130,9 @@
</span><span class="cx"> if ( 0 != $single_revision_id ) {
</span><span class="cx"> $right_revision = get_post( $single_revision_id );
</span><span class="cx">
</span><ins>+ if ( 0 == $compare_to )
+ $left_revision = get_post( $post_id );
+
</ins><span class="cx"> // make sure the right revision is the most recent
</span><span class="cx"> if ( $compare_two_mode && $right_revision->ID < $left_revision->ID ) {
</span><span class="cx"> $temp = $left_revision;
</span><span class="lines">@@ -2155,7 +2158,8 @@
</span><span class="cx"> if ( ! empty( $show_split_view ) )
</span><span class="cx"> $args = array( 'show_split_view' => true );
</span><span class="cx">
</span><del>- $diff = wp_text_diff_with_count( $left_content, $right_content, $args );
</del><ins>+ // compare_to == 0 means first revision, so compare to a blank field to show whats changed
+ $diff = wp_text_diff_with_count( ( 0 == $compare_to) ? '' : $left_content, $right_content, $args );
</ins><span class="cx">
</span><span class="cx"> if ( isset( $diff[ 'html' ] ) )
</span><span class="cx"> $content .= $diff[ 'html' ];
</span><span class="lines">@@ -2185,6 +2189,7 @@
</span><span class="cx"> $revisions = array_reverse( $revisions );
</span><span class="cx">
</span><span class="cx"> $previous_revision_id = 0;
</span><ins>+
</ins><span class="cx"> foreach ( $revisions as $revision ) :
</span><span class="cx"> //error_log( ( $show_autosaves ));
</span><span class="cx"> if ( empty( $show_autosaves ) && wp_is_post_autosave( $revision ) )
</span><span class="lines">@@ -2269,7 +2274,7 @@
</span><span class="cx"> $revision_from_date_author = $revision_date_author;
</span><span class="cx"> $revision_date_author = $tmp;
</span><span class="cx"> }
</span><del>- if ( ( $compare_two_mode || 0 !== $previous_revision_id ) ) {
</del><ins>+ if ( ( $compare_two_mode || -1 !== $previous_revision_id ) ) {
</ins><span class="cx"> $alltherevisions[] = array (
</span><span class="cx"> 'ID' => $revision->ID,
</span><span class="cx"> 'revision_date_author' => $revision_date_author,
</span></span></pre></div>
<a id="trunkwpadminjsrevisionsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/revisions.js (23871 => 23872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/revisions.js 2013-03-29 20:39:54 UTC (rev 23871)
+++ trunk/wp-admin/js/revisions.js 2013-03-29 20:50:09 UTC (rev 23872)
</span><span class="lines">@@ -424,19 +424,22 @@
</span><span class="cx"> // render the revisions
</span><span class="cx"> render: function() {
</span><span class="cx"> var addHtml = '';
</span><ins>+ var thediff;
</ins><span class="cx"> // compare two revisions mode?
</span><span class="cx">
</span><span class="cx"> if ( 2 === REVAPP._compareOneOrTwo ) {
</span><ins>+
</ins><span class="cx"> this.comparetwochecked = 'checked';
</span><span class="cx"> if ( this.draggingLeft ) {
</span><del>- if ( this.model.at( REVAPP._leftDiff ) ) {
</del><ins>+ thediff = REVAPP._leftDiff -1;
+ if ( this.model.at( thediff ) ) {
</ins><span class="cx"> addHtml = this.template( _.extend(
</span><del>- this.model.at( REVAPP._leftDiff ).toJSON(),
</del><ins>+ this.model.at( thediff ).toJSON(),
</ins><span class="cx"> { comparetwochecked: this.comparetwochecked } // keep the checkmark checked
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx"> } else { // dragging right handle
</span><del>- var thediff = REVAPP._rightDiff;
</del><ins>+ thediff = REVAPP._rightDiff -1;
</ins><span class="cx"> if ( this.model.at( thediff ) ) {
</span><span class="cx"> addHtml = this.template( _.extend(
</span><span class="cx"> this.model.at( thediff ).toJSON(),
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (23871 => 23872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2013-03-29 20:39:54 UTC (rev 23871)
+++ trunk/wp-includes/post-template.php 2013-03-29 20:50:09 UTC (rev 23872)
</span><span class="lines">@@ -1426,7 +1426,7 @@
</span><span class="cx"> // The following removes that revision when $parent == false
</span><span class="cx"> $parent_included = _wp_last_revision_matches_current_post( $post_id );
</span><span class="cx"> if ( $parent_included && ! $parent )
</span><del>- array_pop( $revisions );
</del><ins>+ array_shift( $revisions );
</ins><span class="cx"> elseif ( ! $parent_included && $parent )
</span><span class="cx"> array_unshift( $revisions, $post );
</span><span class="cx">
</span><span class="lines">@@ -1436,7 +1436,7 @@
</span><span class="cx"> foreach ( $revisions as $revision ) {
</span><span class="cx"> if ( !current_user_can( 'read_post', $revision->ID ) )
</span><span class="cx"> continue;
</span><del>-
</del><ins>+
</ins><span class="cx"> $is_autosave = wp_is_post_autosave( $revision );
</span><span class="cx"> if ( ( 'revision' === $type && $is_autosave ) || ( 'autosave' === $type && ! $is_autosave ) )
</span><span class="cx"> continue;
</span></span></pre>
</div>
</div>
</body>
</html>