Revisions: when upgrading the revision author don't add a copy of the post as latest revision when some of the revisions are already at v1. See #16215
git-svn-id: http://core.svn.wordpress.org/trunk@24025 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
5f2f48135b
commit
2407b26f69
|
@ -627,6 +627,7 @@ function _wp_upgrade_revisions_of_post( $post, $revisions ) {
|
||||||
update_option( $lock, $now );
|
update_option( $lock, $now );
|
||||||
|
|
||||||
reset( $revisions );
|
reset( $revisions );
|
||||||
|
$add_last = true;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
$this_revision = current( $revisions );
|
$this_revision = current( $revisions );
|
||||||
|
@ -638,9 +639,12 @@ function _wp_upgrade_revisions_of_post( $post, $revisions ) {
|
||||||
if ( false === $this_revision_version )
|
if ( false === $this_revision_version )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// 1 is the latest revision version, so we're already up to date
|
// 1 is the latest revision version, so we're already up to date.
|
||||||
if ( 0 < $this_revision_version )
|
// No need to add a copy of the post as latest revision.
|
||||||
|
if ( 0 < $this_revision_version ) {
|
||||||
|
$add_last = false;
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
// Always update the revision version
|
// Always update the revision version
|
||||||
$update = array(
|
$update = array(
|
||||||
|
@ -669,7 +673,9 @@ function _wp_upgrade_revisions_of_post( $post, $revisions ) {
|
||||||
delete_option( $lock );
|
delete_option( $lock );
|
||||||
|
|
||||||
// Add a copy of the post as latest revision.
|
// Add a copy of the post as latest revision.
|
||||||
wp_save_post_revision( $post->ID );
|
if ( $add_last )
|
||||||
|
wp_save_post_revision( $post->ID );
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue