Wordpress 4.6

[autoinstalls/wordpress.git] / wp-admin / revision.php

diff --git a/wp-admin/revision.php b/wp-admin/revision.php
index 4d86c536b9a77a370b4277362818d4276e31fa85..547b3546fe935faf26680d56916d67db34b59587 100644 (file)
--- a/wp-admin/revision.php
+++ b/wp-admin/revision.php
@@ -40,8 +40,8 @@ case 'restore' :
        if ( ! $post = get_post( $revision->post_parent ) )
                break;
 
        if ( ! $post = get_post( $revision->post_parent ) )
                break;
 

-       // Revisions disabled (previously checked autosaves && ! wp_is_post_autosave( $revision ))
-       if ( ! wp_revisions_enabled( $post ) ) {
+       // Restore if revisions are enabled or this is an autosave.
+       if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {

                $redirect = 'edit.php?post_type=' . $post->post_type;
                break;
        }
                $redirect = 'edit.php?post_type=' . $post->post_type;
                break;
        }


@@ -63,7 +63,7 @@ default :
        if ( ! $post = get_post( $revision->post_parent ) )
                break;
 
        if ( ! $post = get_post( $revision->post_parent ) )
                break;
 

-       if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'read_post', $post->ID ) )
+       if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'edit_post', $revision->post_parent ) )

                break;
 
        // Revisions disabled and we're not looking at an autosave
                break;
 
        // Revisions disabled and we're not looking at an autosave