<!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>[23414] trunk/wp-includes: Revisions: Before saving a new post revision make sure that something has changed in the fields that we are revisioning.</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/23414">23414</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2013-02-14 11:36:32 +0000 (Thu, 14 Feb 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revisions: Before saving a new post revision make sure that something has changed in the fields that we are revisioning.
Fixes: <a href="http://core.trac.wordpress.org/ticket/7392">#7392</a> and <a href="http://core.trac.wordpress.org/ticket/9843">#9843</a> props adamsilverstein.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdefaultfiltersphp">trunk/wp-includes/default-filters.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-filters.php (23413 => 23414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-filters.php 2013-02-14 05:52:23 UTC (rev 23413)
+++ trunk/wp-includes/default-filters.php 2013-02-14 11:36:32 UTC (rev 23414)
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> add_action( 'plugins_loaded', 'wp_maybe_load_widgets', 0 );
</span><span class="cx"> add_action( 'plugins_loaded', 'wp_maybe_load_embeds', 0 );
</span><span class="cx"> add_action( 'shutdown', 'wp_ob_end_flush_all', 1 );
</span><del>-add_action( 'pre_post_update', 'wp_save_post_revision' );
</del><ins>+add_action( 'pre_post_update', 'wp_save_post_revision', 10, 2 );
</ins><span class="cx"> add_action( 'publish_post', '_publish_post_hook', 5, 1 );
</span><span class="cx"> add_action( 'transition_post_status', '_transition_post_status', 5, 3 );
</span><span class="cx"> add_action( 'transition_post_status', '_update_term_count_on_transition_post_status', 10, 3 );
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (23413 => 23414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2013-02-14 05:52:23 UTC (rev 23413)
+++ trunk/wp-includes/post.php 2013-02-14 11:36:32 UTC (rev 23414)
</span><span class="lines">@@ -2866,7 +2866,7 @@
</span><span class="cx"> $where = array( 'ID' => $post_ID );
</span><span class="cx">
</span><span class="cx"> if ( $update ) {
</span><del>- do_action( 'pre_post_update', $post_ID );
</del><ins>+ do_action( 'pre_post_update', $post_ID, $data );
</ins><span class="cx"> if ( false === $wpdb->update( $wpdb->posts, $data, $where ) ) {
</span><span class="cx"> if ( $wp_error )
</span><span class="cx"> return new WP_Error('db_update_error', __('Could not update post in the database'), $wpdb->last_error);
</span><span class="lines">@@ -4929,7 +4929,7 @@
</span><span class="cx"> * @param int $post_id The ID of the post to save as a revision.
</span><span class="cx"> * @return mixed Null or 0 if error, new revision ID, if success.
</span><span class="cx"> */
</span><del>-function wp_save_post_revision( $post_id ) {
</del><ins>+function wp_save_post_revision( $post_id, $new_data = null ) {
</ins><span class="cx"> // We do autosaves manually with wp_create_post_autosave()
</span><span class="cx"> if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
</span><span class="cx"> return;
</span><span class="lines">@@ -4947,6 +4947,20 @@
</span><span class="cx"> if ( !post_type_supports($post['post_type'], 'revisions') )
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // if new data is supplied, check that it is different from last saved revision
+ if( is_array( $new_data ) ) {
+ $post_has_changed = false;
+ foreach( array_keys( _wp_post_revision_fields() ) as $field ) {
+ if( normalize_whitespace( $new_data[ $field ] ) != normalize_whitespace( $post[ $field ] ) ) {
+ $post_has_changed = true;
+ break;
+ }
+ }
+ //don't save revision if post unchanged
+ if( ! $post_has_changed )
+ return;
+ }
+
</ins><span class="cx"> $return = _wp_put_post_revision( $post );
</span><span class="cx">
</span><span class="cx"> // WP_POST_REVISIONS = true (default), -1
</span></span></pre>
</div>
</div>
</body>
</html>