Changeset 14749 for trunk/wp-admin/revision.php

Timestamp:

05/19/2010 06:36:52 PM (16 years ago)

Author:

ryan

Message:

Fix viewing autosave revision for custom post types. Props duck_. fixes #13110

File:

• trunk/wp-admin/revision.php (modified) (9 diffs)

trunk/wp-admin/revision.php

@@ -12 +12 @@
 wp_enqueue_script('list-revisions');
 
-wp_reset_vars(array('revision', 'left', 'right', 'diff', 'action'));
+wp_reset_vars(array('revision', 'left', 'right', 'action'));
 
 $revision_id = absint($revision);
-$diff        = absint($diff);
 $left        = absint($left);
 $right       = absint($right);
@@ -30 +29 @@
                 break;
 
-        if ( ! WP_POST_REVISIONS && !wp_is_post_autosave( $revision ) ) // Revisions disabled and we're not looking at an autosave
-                break;
+        // Revisions disabled and we're not looking at an autosave
+        if ( ( ! WP_POST_REVISIONS || !post_type_supports($post->post_type, 'revisions') ) && !wp_is_post_autosave( $revision ) ) {
+                $redirect = 'edit.php?post_type=' . $post->post_type;
+                break;
+        }
 
         check_admin_referer( "restore-post_$post->ID|$revision->ID" );
@@ -69 +71 @@
                 break; // Don't diff two unrelated revisions
 
-        if ( ! WP_POST_REVISIONS ) { // Revisions disabled
+        if ( ! WP_POST_REVISIONS || !post_type_supports($post->post_type, 'revisions') ) { // Revisions disabled
                 if (
                         // we're not looking at an autosave
@@ -76 +78 @@
                         // we're not comparing an autosave to the current post
                         ( $post->ID !== $left_revision->ID && $post->ID !== $right_revision->ID )
-                )
+                ) {
+                        $redirect = 'edit.php?post_type=' . $post->post_type;
                         break;
+                }
         }
 
@@ -91 +95 @@
         $post_title = '<a href="' . get_edit_post_link() . '">' . get_the_title() . '</a>';
         $h2 = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
+        $title = __( 'Revisions' );
 
         $left  = $left_revision->ID;
@@ -107 +112 @@
                 break;
 
-        if ( ! WP_POST_REVISIONS && !wp_is_post_autosave( $revision ) ) // Revisions disabled and we're not looking at an autosave
-                break;
-
-        $post_type_object = get_post_type_object($post->post_type);
+        // Revisions disabled and we're not looking at an autosave
+        if ( ( ! WP_POST_REVISIONS || !post_type_supports($post->post_type, 'revisions') ) && !wp_is_post_autosave( $revision ) ) {
+                $redirect = 'edit.php?post_type=' . $post->post_type;
+                break;
+        }
 
         $post_title = '<a href="' . get_edit_post_link() . '">' . get_the_title() . '</a>';
@@ -125 +131 @@
 endswitch;
 
-if ( !$redirect ) {
-        if ( empty($post->post_type) ) // Empty post_type means either malformed object found, or no valid parent was found.
-                $redirect = 'edit.php';
-        elseif ( !post_type_supports($post->post_type, 'revisions') )
-                $redirect = 'edit.php?post_type=' . $post->post_type;
-}
+// Empty post_type means either malformed object found, or no valid parent was found.
+if ( !$redirect && empty($post->post_type) )
+        $redirect = 'edit.php';
 
 if ( !empty($redirect) ) {
@@ -208 +211 @@
 
 $args = array( 'format' => 'form-table', 'parent' => true, 'right' => $right, 'left' => $left );
-if ( ! WP_POST_REVISIONS )
+if ( ! WP_POST_REVISIONS || !post_type_supports($post->post_type, 'revisions') )
         $args['type'] = 'autosave';
 
@@ -218 +221 @@
 
 <?php
-
 require_once( './admin-footer.php' );