Changeset 31062

Timestamp:

01/06/2015 09:46:54 PM (8 years ago)

Author:

ocean90

Message:

Customizer: Send JSON success for customize_save and allow response to be filtered.

props westonruter.
fixes #29098.

Location:

trunk/src

Files:

• wp-admin/js/customize-controls.js (modified) (4 diffs)
• wp-includes/class-wp-customize-manager.php (modified) (2 diffs)

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

@@ -1946 +1946 @@
                 var self  = this,
                     query = $.extend( this.query(), {
-                        action: 'customize_save',
                         nonce:  this.nonce.save
                     } ),
@@ -1956 +1955 @@
 
                 submit = function () {
-                    var request = $.post( api.settings.url.ajax, query );
+                    var request = wp.ajax.post( 'customize_save', query );
 
                     api.trigger( 'save', request );
@@ -1964 +1963 @@
                     } );
 
-                    request.done( function( response ) {
-                        // Check if the user is logged out.
+                    request.fail( function ( response ) {
                         if ( '0' === response ) {
+                            response = 'not_logged_in';
+                        } else if ( '-1' === response ) {
+                            // Back-compat in case any other check_ajax_referer() call is dying
+                            response = 'invalid_nonce';
+                        }
+
+                        if ( 'invalid_nonce' === response ) {
+                            self.cheatin();
+                        } else if ( 'not_logged_in' === response ) {
                             self.preview.iframe.hide();
                             self.login().done( function() {
@@ -1972 +1979 @@
                                 self.preview.iframe.show();
                             } );
-                            return;
                         }
-
-                        // Check for cheaters.
-                        if ( '-1' === response ) {
-                            self.cheatin();
-                            return;
-                        }
-
+                        api.trigger( 'error', response );
+                    } );
+
+                    request.done( function( response ) {
                         // Clear setting dirty states
                         api.each( function ( value ) {
                             value._dirty = false;
                         } );
-                        api.trigger( 'saved' );
+
+                        api.trigger( 'saved', response );
                     } );
                 };

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

@@ -629 +629 @@
      */
     public function save() {
-        if ( ! $this->is_preview() )
-            die;
-
-        check_ajax_referer( 'save-customize_' . $this->get_stylesheet(), 'nonce' );
+        if ( ! $this->is_preview() ) {
+            wp_send_json_error( 'not_preview' );
+        }
+
+        $action = 'save-customize_' . $this->get_stylesheet();
+        if ( ! check_ajax_referer( $action, 'nonce', false ) ) {
+            wp_send_json_error( 'invalid_nonce' );
+        }
 
         // Do we have to switch themes?
@@ -667 +671 @@
         do_action( 'customize_save_after', $this );
 
-        die;
+        /**
+         * Filter response data for a successful customize_save Ajax request.
+         * 
+         * This filter does not apply if there was a nonce or authentication failure.
+         *
+         * @since 4.2.0
+         *
+         * @param array $data
+         * @param WP_Customize_Manager $this WP_Customize_Manager instance.
+         */
+        $response = apply_filters( 'customize_save_response', array(), $this );
+        wp_send_json_success( $response );
     }