Changeset 36414 for trunk/src/wp-includes/class-wp-customize-nav-menus.php

Timestamp:

01/27/2016 05:54:39 PM (11 years ago)

Author:

westonruter

Message:

Customizer: Export nonce, theme, and url app settings in preview as exported in pane.

• Introduce WP_Customize_Manager::get_nonces() to consolidate logic for retrieving nonces.
• Export nonces centrally in wp.customize.settings.nonce with each request and update nav menus preview to utilize.
• Send updated nonces to preview upon nonce-refresh.
• Request full preview refresh if Nav Menu selective refresh request fails (e.g. due to bad nonce).
• Update nav menus and widgets in Customizer to utilize customize_refresh_nonces for exporting nonces and keeping them up to date.

See #27355.
Fixes #35617.

File:

• trunk/src/wp-includes/class-wp-customize-nav-menus.php (modified) (4 diffs)

trunk/src/wp-includes/class-wp-customize-nav-menus.php

@@ -49 +49 @@
                 $this->manager         = $manager;
 
+                add_filter( 'customize_refresh_nonces', array( $this, 'filter_nonces' ) );
                 add_action( 'wp_ajax_load-available-menu-items-customizer', array( $this, 'ajax_load_available_items' ) );
                 add_action( 'wp_ajax_search-available-menu-items-customizer', array( $this, 'ajax_search_available_items' ) );
@@ -61 +62 @@
                 add_action( 'customize_controls_print_footer_scripts', array( $this, 'available_items_template' ) );
                 add_action( 'customize_preview_init', array( $this, 'customize_preview_init' ) );
+        }
+
+        /**
+         * Add nonce for customizing menus.
+         *
+         * @since 4.5.0
+         * @access public
+         *
+         * @param  array $nonces Array of nonces.
+         * @return array $nonces Array of nonces.
+         */
+        public function filter_nonces( $nonces ) {
+                $nonces['customize-menus'] = wp_create_nonce( 'customize-menus' );
+                return $nonces;
         }
 
@@ -330 +345 @@
                 // Pass data to JS.
                 $settings = array(
-                        'nonce'                => wp_create_nonce( 'customize-menus' ),
                         'allMenus'             => wp_get_nav_menus(),
                         'itemTypes'            => $this->available_item_types(),
@@ -940 +954 @@
                         'renderNonceValue'      => wp_create_nonce( self::RENDER_AJAX_ACTION ),
                         'renderNoncePostKey'    => self::RENDER_NONCE_POST_KEY,
-                        'requestUri'            => empty( $_SERVER['REQUEST_URI'] ) ? home_url( '/' ) : esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
-                        'theme'                 => array(
-                                'stylesheet' => $this->manager->get_stylesheet(),
-                                'active'     => $this->manager->is_theme_active(),
-                        ),
-                        'previewCustomizeNonce' => wp_create_nonce( 'preview-customize_' . $this->manager->get_stylesheet() ),
                         'navMenuInstanceArgs'   => $this->preview_nav_menu_instance_args,
                         'l10n'                  => array(