Changeset 42620 for branches/4.9/src/wp-includes/class-wp-customize-manager.php

Timestamp:

01/30/2018 02:43:55 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Customize: Ensure customize_autosaved requests only use revision of logged-in user.

Props dlh, westonruter.
See #42433, #39896.
Merges [42615] to the 4.9 branch.
Fixes #42450.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-customize-manager.php (modified) (4 diffs)

branches/4.9/src/wp-includes/class-wp-customize-manager.php

@@ -1136 +1136 @@
             $this->_changeset_data = array();
         } else {
-            if ( $this->autosaved() ) {
+            if ( $this->autosaved() && is_user_logged_in() ) {
                 $autosave_post = wp_get_post_autosave( $changeset_post_id, get_current_user_id() );
                 if ( $autosave_post ) {
@@ -2879 +2879 @@
                 $r = wp_update_post( wp_slash( $post_array ), true );
 
-                // Delete autosave revision when the changeset is updated.
-                $autosave_draft = wp_get_post_autosave( $changeset_post_id, get_current_user_id() );
-                if ( $autosave_draft ) {
-                    wp_delete_post( $autosave_draft->ID, true );
+                // Delete autosave revision for user when the changeset is updated.
+                if ( ! empty( $args['user_id'] ) ) {
+                    $autosave_draft = wp_get_post_autosave( $changeset_post_id, $args['user_id'] );
+                    if ( $autosave_draft ) {
+                        wp_delete_post( $autosave_draft->ID, true );
+                    }
                 }
             }
@@ -3494 +3496 @@
      */
     public function handle_dismiss_autosave_or_lock_request() {
+        // Calls to dismiss_user_auto_draft_changesets() and wp_get_post_autosave() require non-zero get_current_user_id().
+        if ( ! is_user_logged_in() ) {
+            wp_send_json_error( 'unauthenticated', 401 );
+        }
+
         if ( ! $this->is_preview() ) {
             wp_send_json_error( 'not_preview', 400 );
@@ -4575 +4582 @@
         if ( ! $this->saved_starter_content_changeset && ! $this->autosaved() ) {
             if ( $changeset_post_id ) {
-                $autosave_revision_post = wp_get_post_autosave( $changeset_post_id, get_current_user_id() );
+                if ( is_user_logged_in() ) {
+                    $autosave_revision_post = wp_get_post_autosave( $changeset_post_id, get_current_user_id() );
+                }
             } else {
                 $autosave_autodraft_posts = $this->get_changeset_posts( array(