sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix wp_list_post_revisions() to include all autosaves when listing autosaves only and properly include or exclude the current post, see #23665, see #16215 

git-svn-id: https://develop.svn.wordpress.org/trunk@23830 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2013-03-28 00:56:44 +00:00
parent ac87a472f7
commit 0a02f89dec
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
wp-includes/post-template.php
View File

@ -1416,32 +1416,19 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) {
$defaults = array( 'parent' => false, 'right' => false, 'left' => false, 'format' => 'list', 'type' => 'all' ); $defaults = array( 'parent' => false, 'right' => false, 'left' => false, 'format' => 'list', 'type' => 'all' );
extract( wp_parse_args( $args, $defaults ), EXTR_SKIP ); extract( wp_parse_args( $args, $defaults ), EXTR_SKIP );
switch ( $type ) {
case 'autosave' :
if ( !$autosave = wp_get_post_autosave( $post->ID ) )
return;
$revisions = array( $autosave );
break;
case 'revision' : // just revisions - remove autosave later
case 'all' :
default :
if ( !$revisions = wp_get_post_revisions( $post->ID ) ) if ( !$revisions = wp_get_post_revisions( $post->ID ) )
return; return;
break;
}
/* translators: post revision: 1: when, 2: author name */ /* translators: post revision: 1: when, 2: author name */
$titlef = _x( '%1$s', 'post revision' ); $titlef = _x( '%1$s', 'post revision' );
if ( $parent ) // Since 3.6 revisions include a copy of the current post data as a revision.
array_unshift( $revisions, $post ); // The following removes that revision when $parent == false
$parent_included = wp_first_revision_matches_current_version( $post_id );
// since 3.6 revisions include a copy of the current post data as a revision if ( $parent_included && ! $parent )
// the collowing removes this current revision if present from the list of
// revisions returned by wp_list_post_revisions, remove these to include the
// crrent post revision in the list of revisions
if ( wp_first_revision_matches_current_version( $post_id ) )
array_pop( $revisions ); array_pop( $revisions );
elseif ( ! $parent_included && $parent )
array_unshift( $revisions, $post );
$rows = $right_checked = ''; $rows = $right_checked = '';
$class = false; $class = false;
@ -1449,7 +1436,9 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) {
foreach ( $revisions as $revision ) { foreach ( $revisions as $revision ) {
if ( !current_user_can( 'read_post', $revision->ID ) ) if ( !current_user_can( 'read_post', $revision->ID ) )
continue; continue;
if ( 'revision' === $type && wp_is_post_autosave( $revision ) )
$is_autosave = wp_is_post_autosave( $revision );
if ( ( 'revision' === $type && $is_autosave ) || ( 'autosave' === $type && ! $is_autosave ) )
continue; continue;
$date = wp_post_revision_title_expanded( $revision ); $date = wp_post_revision_title_expanded( $revision );
@ -1529,5 +1518,4 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) {
} }
endif; endif;
} }