<!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>[23859] trunk/wp-includes/revision.php: Revision our post format postmeta.</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/23859">23859</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-03-29 10:37:44 +0000 (Fri, 29 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revision our post format postmeta.
props kovshenin, WraithKenny. see <a href="http://core.trac.wordpress.org/ticket/20564">#20564</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesrevisionphp">trunk/wp-includes/revision.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesrevisionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/revision.php (23858 => 23859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/revision.php 2013-03-29 09:30:48 UTC (rev 23858)
+++ trunk/wp-includes/revision.php 2013-03-29 10:37:44 UTC (rev 23859)
</span><span class="lines">@@ -61,6 +61,25 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Determines which post meta fields are revisioned.
+ *
+ * @since 3.6
+ * @access private
+ * @return array An array of meta keys that should be revisioned.
+ */
+function _wp_post_revision_meta_keys() {
+ return array(
+ '_wp_format_url',
+ '_wp_format_quote',
+ '_wp_format_quote_source',
+ '_wp_format_image',
+ '_wp_format_gallery',
+ '_wp_format_audio',
+ '_wp_format_video',
+ );
+}
+
+/**
</ins><span class="cx"> * Saves an already existing post as a post revision.
</span><span class="cx"> *
</span><span class="cx"> * Typically used immediately after post updates.
</span><span class="lines">@@ -113,6 +132,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Check whether revisioned meta fields have changed.
+ foreach ( _wp_post_revision_meta_keys() as $meta_key ) {
+ if ( get_post_meta( $post->ID, $meta_key ) != get_post_meta( $last_revision->ID, $meta_key ) ) {
+ $post_has_changed = true;
+ break;
+ }
+ }
+
</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">@@ -240,6 +267,7 @@
</span><span class="cx"> if ( isset($post['post_type']) && 'revision' == $post['post_type'] )
</span><span class="cx"> return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
</span><span class="cx">
</span><ins>+ $post_id = $post['ID'];
</ins><span class="cx"> $post = _wp_post_revision_fields( $post, $autosave );
</span><span class="cx"> $post = wp_slash($post); //since data is from db
</span><span class="cx">
</span><span class="lines">@@ -250,6 +278,18 @@
</span><span class="cx"> if ( $revision_id )
</span><span class="cx"> do_action( '_wp_put_post_revision', $revision_id );
</span><span class="cx">
</span><ins>+ // Save revisioned meta fields.
+ foreach ( _wp_post_revision_meta_keys() as $meta_key ) {
+ $meta_values = get_post_meta( $post_id, $meta_key );
+ if ( false === $meta_values )
+ continue;
+
+ // Use the underlying add_metadata vs add_post_meta to make sure
+ // metadata is added to the revision post and not its parent.
+ foreach ( $meta_values as $meta_value )
+ add_metadata( 'post', $revision_id, $meta_key, $meta_value );
+ }
+
</ins><span class="cx"> return $revision_id;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -324,6 +364,17 @@
</span><span class="cx">
</span><span class="cx"> $update = wp_slash( $update ); //since data is from db
</span><span class="cx">
</span><ins>+ // Restore revisioned meta fields.
+ foreach ( _wp_post_revision_meta_keys() as $meta_key ) {
+ 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 );
+ }
+
</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></pre>
</div>
</div>
</body>
</html>