Changeset 23830

Timestamp:

03/28/2013 12:56:44 AM (12 years ago)

Author:

azaozz

Message:

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

File:

• trunk/wp-includes/post-template.php (modified) (3 diffs)

trunk/wp-includes/post-template.php

@@ -1417 +1417 @@
     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 ) )
-                return;
-            break;
-    }
+    if ( !$revisions = wp_get_post_revisions( $post->ID ) )
+        return;
 
     /* translators: post revision: 1: when, 2: author name */
     $titlef = _x( '%1$s', 'post revision' );
 
-    if ( $parent )
+    // Since 3.6 revisions include a copy of the current post data as a revision.
+    // The following removes that revision when $parent == false
+    $parent_included = wp_first_revision_matches_current_version( $post_id );
+    if ( $parent_included && ! $parent )
+        array_pop( $revisions );
+    elseif ( ! $parent_included && $parent )
         array_unshift( $revisions, $post );
-
-    // since 3.6 revisions include a copy of the current post data as a revision
-    // 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 );
 
     $rows = $right_checked = '';
@@ -1450 +1437 @@
         if ( !current_user_can( 'read_post', $revision->ID ) )
             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;
 
@@ -1530 +1519 @@
 
     endif;
-
-}
+}