<!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>[23928] trunk: Revisions:</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/23928">23928</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-04-06 23:18:52 +0000 (Sat, 06 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revisions:
- Store the post format as meta on revisions (including autosaves).
- Add post formats data (post meta) when autosaving.
- Only add non-empty post formats data to revisions.
- Correct the post format when previewing a published post.
Props kovshenin, see <a href="http://core.trac.wordpress.org/ticket/19570">#19570</a>, see <a href="http://core.trac.wordpress.org/ticket/20564">#20564</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpincludesjsautosavejs">trunk/wp-includes/js/autosave.js</a></li>
<li><a href="#trunkwpincludesrevisionphp">trunk/wp-includes/revision.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (23927 => 23928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2013-04-06 22:58:42 UTC (rev 23927)
+++ trunk/wp-admin/includes/post.php 2013-04-06 23:18:52 UTC (rev 23928)
</span><span class="lines">@@ -1279,17 +1279,26 @@
</span><span class="cx"> $new_autosave['ID'] = $old_autosave->ID;
</span><span class="cx"> $new_autosave['post_author'] = $post_author;
</span><span class="cx">
</span><del>- // Auto-save revisioned meta fields too.
</del><ins>+ // Auto-save revisioned meta fields.
</ins><span class="cx"> foreach ( _wp_post_revision_meta_keys() as $meta_key ) {
</span><del>- if ( ! isset( $_POST[ $meta_key ] ) )
- continue;
</del><ins>+ if ( isset( $_POST[ $meta_key ] ) && get_post_meta( $new_autosave['ID'], $meta_key, true ) != $_POST[ $meta_key ] ) {
+ // Use the underlying delete_metadata and add_metadata vs delete_post_meta
+ // and add_post_meta to make sure we're working with the actual revision meta.
+ delete_metadata( 'post', $new_autosave['ID'], $meta_key );
</ins><span class="cx">
</span><del>- // Use the underlying delete_metadata and add_metadata vs delete_post_meta
- // and add_post_meta to make sure we're working with the actual revision meta.
- delete_metadata( 'post', $new_autosave['ID'], $meta_key );
- add_metadata( 'post', $new_autosave['ID'], $meta_key, $_POST[ $meta_key ] );
</del><ins>+ if ( ! empty( $_POST[ $meta_key ] ) )
+ add_metadata( 'post', $new_autosave['ID'], $meta_key, $_POST[ $meta_key ] );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Save the post format if different
+ if ( isset( $_POST['post_format'] ) && get_post_meta( $new_autosave['ID'], '_revision_post_format', true ) != $_POST['post_format'] ) {
+ delete_metadata( 'post', $new_autosave['ID'], '_revision_post_format' );
+
+ if ( ! empty( $_POST['post_format'] ) )
+ add_metadata( 'post', $new_autosave['ID'], '_revision_post_format', $_POST['post_format'] );
+ }
+
</ins><span class="cx"> return wp_update_post( $new_autosave );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesjsautosavejs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/autosave.js (23927 => 23928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/autosave.js 2013-04-06 22:58:42 UTC (rev 23927)
+++ trunk/wp-includes/js/autosave.js 2013-04-06 23:18:52 UTC (rev 23928)
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> (function($){
</span><span class="cx"> // Returns the data for saving in both localStorage and autosaves to the server
</span><span class="cx"> wp.autosave.getPostData = function() {
</span><del>- var ed = typeof tinymce != 'undefined' ? tinymce.activeEditor : null, post_name, parent_id, cats = [],
</del><ins>+ var ed = typeof tinymce != 'undefined' ? tinymce.activeEditor : null, post_name, parent_id, post_format, cats = [],
</ins><span class="cx"> data = {
</span><span class="cx"> action: 'autosave',
</span><span class="cx"> autosave: true,
</span><span class="lines">@@ -364,6 +364,13 @@
</span><span class="cx"> if ( $('#auto_draft').val() == '1' )
</span><span class="cx"> data['auto_draft'] = '1';
</span><span class="cx">
</span><ins>+ post_format = $('#post_format').val() || '';
+ data['post_format'] = post_format == 'standard' ? '' : post_format;
+
+ $('.post-formats-fields').find('input[name^="_wp_format_"], textarea[name^="_wp_format_"]').each( function(i, field) {
+ data[ field.name ] = field.value || '';
+ });
+
</ins><span class="cx"> return data;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesrevisionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/revision.php (23927 => 23928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/revision.php 2013-04-06 22:58:42 UTC (rev 23927)
+++ trunk/wp-includes/revision.php 2013-04-06 23:18:52 UTC (rev 23928)
</span><span class="lines">@@ -134,12 +134,16 @@
</span><span class="cx">
</span><span class="cx"> // Check whether revisioned meta fields have changed.
</span><span class="cx"> foreach ( _wp_post_revision_meta_keys() as $meta_key ) {
</span><del>- if ( get_post_meta( $post->ID, $meta_key ) != get_post_meta( $last_revision->ID, $meta_key ) ) {
</del><ins>+ if ( get_post_meta( $post->ID, $meta_key, true ) != get_post_meta( $last_revision->ID, $meta_key, true ) ) {
</ins><span class="cx"> $post_has_changed = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Check whether the post format has changed
+ if ( get_post_format( $post->ID ) != get_post_meta( $last_revision->ID, '_revision_post_format', true ) )
+ $post_has_changed = true;
+
</ins><span class="cx"> //don't save revision if post unchanged
</span><span class="cx"> if( ! $post_has_changed )
</span><span class="cx"> return;
</span><span class="lines">@@ -280,16 +284,19 @@
</span><span class="cx">
</span><span class="cx"> // Save revisioned meta fields.
</span><span class="cx"> foreach ( _wp_post_revision_meta_keys() as $meta_key ) {
</span><del>- $meta_values = get_post_meta( $post_id, $meta_key );
- if ( false === $meta_values )
</del><ins>+ $meta_value = get_post_meta( $post_id, $meta_key, true );
+ if ( empty( $meta_value ) )
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> // Use the underlying add_metadata vs add_post_meta to make sure
</span><span class="cx"> // metadata is added to the revision post and not its parent.
</span><del>- foreach ( $meta_values as $meta_value )
- add_metadata( 'post', $revision_id, $meta_key, $meta_value );
</del><ins>+ add_metadata( 'post', $revision_id, $meta_key, wp_slash( $meta_value ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Save the post format
+ if ( $post_format = get_post_format( $post_id ) )
+ add_metadata( 'post', $revision_id, '_revision_post_format', $post_format );
+
</ins><span class="cx"> return $revision_id;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -366,15 +373,16 @@
</span><span class="cx">
</span><span class="cx"> // Restore revisioned meta fields.
</span><span class="cx"> foreach ( _wp_post_revision_meta_keys() as $meta_key ) {
</span><del>- delete_post_meta( $update['ID'], $meta_key );
- $meta_values = get_post_meta( $revision['ID'], $meta_key );
- if ( false === $meta_values )
- continue;
-
- foreach ( $meta_values as $meta_value )
- add_post_meta( $update['ID'], $meta_key, $meta_value );
</del><ins>+ $meta_value = get_post_meta( $revision['ID'], $meta_key, true );
+ if ( empty( $meta_value ) )
+ $meta_value = '';
+ // Add slashes to data pulled from the db
+ update_post_meta( $update['ID'], $meta_key, wp_slash( $meta_value ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Restore post format
+ set_post_format( $update['ID'], get_post_meta( $revision['ID'], '_revision_post_format', true ) );
+
</ins><span class="cx"> $post_id = wp_update_post( $update );
</span><span class="cx"> if ( is_wp_error( $post_id ) )
</span><span class="cx"> return $post_id;
</span><span class="lines">@@ -505,6 +513,7 @@
</span><span class="cx"> $post->post_excerpt = $preview->post_excerpt;
</span><span class="cx">
</span><span class="cx"> add_filter( 'get_post_metadata', '_wp_preview_meta_filter', 10, 4 );
</span><ins>+ add_filter( 'get_the_terms', '_wp_preview_terms_filter', 10, 3 );
</ins><span class="cx">
</span><span class="cx"> return $post;
</span><span class="cx"> }
</span><span class="lines">@@ -541,6 +550,29 @@
</span><span class="cx"> return get_post_meta( $preview->ID, $meta_key, $single );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Filters terms lookup to get the post format saved with the preview revision.
+ *
+ * @since 2.6
+ * @access private
+ */
+function _wp_preview_terms_filter( $terms, $post_id, $taxonomy ) {
+ $post = get_post();
+
+ if ( $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type )
+ return $terms;
+
+ if ( ! $preview = wp_get_post_autosave( $post->ID ) )
+ return $terms;
+
+ if ( $post_format = get_post_meta( $preview->ID, '_revision_post_format', true ) ) {
+ if ( $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $post_format ), 'post_format' ) )
+ $terms = array( $term ); // Can only have one post format
+ }
+
+ return $terms;
+}
+
</ins><span class="cx"> function _wp_get_post_revision_version( $revision ) {
</span><span class="cx"> if ( is_object( $revision ) )
</span><span class="cx"> $revision = get_object_vars( $revision );
</span></span></pre>
</div>
</div>
</body>
</html>