Changeset 41603

Timestamp:

09/26/2017 08:32:46 PM (6 years ago)

Author:

westonruter

Message:

Customize: Dismiss all autosaved auto-drafts for user and not just the one suggested when dismissing restoration notification.

Amends [41597].
See #39896.

Location:

trunk/src

Files:

• wp-admin/js/customize-controls.js (modified) (1 diff)
• wp-includes/class-wp-customize-manager.php (modified) (1 diff)

trunk/src/wp-admin/js/customize-controls.js

@@ -5511 +5511 @@
                                 wp_customize: 'on',
                                 customize_theme: api.settings.theme.stylesheet,
-                                customize_changeset_uuid: api.settings.changeset.latestAutoDraftUuid || api.settings.changeset.uuid,
+                                customize_changeset_uuid: api.settings.changeset.uuid,
                                 nonce: api.settings.nonce.dismiss_autosave
                             } );

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -3055 +3055 @@
 
         $changeset_post_id = $this->changeset_post_id();
-        if ( empty( $changeset_post_id ) ) {
-            wp_send_json_error( 'missing_changeset', 404 );
-        }
-
-        if ( 'auto-draft' === get_post_status( $changeset_post_id ) ) {
-            if ( ! update_post_meta( $changeset_post_id, '_customize_restore_dismissed', true ) ) {
-                wp_send_json_error( 'auto_draft_dismissal_failure', 500 );
+
+        if ( empty( $changeset_post_id ) || 'auto-draft' === get_post_status( $changeset_post_id ) ) {
+            $changeset_autodraft_posts = $this->get_changeset_posts( array(
+                'post_status' => 'auto-draft',
+                'exclude_restore_dismissed' => true,
+                'posts_per_page' => -1,
+            ) );
+            $dismissed = 0;
+            foreach ( $changeset_autodraft_posts as $autosave_autodraft_post ) {
+                if ( $autosave_autodraft_post->ID === $changeset_post_id ) {
+                    continue;
+                }
+                if ( update_post_meta( $autosave_autodraft_post->ID, '_customize_restore_dismissed', true ) ) {
+                    $dismissed++;
+                }
+            }
+            if ( $dismissed > 0 ) {
+                wp_send_json_success( 'auto_draft_dismissed' );
             } else {
-                wp_send_json_success( 'auto_draft_dismissed' );
+                wp_send_json_error( 'no_autosave_to_delete', 404 );
             }
         } else {