Changeset 34278 for trunk

Timestamp:

09/18/2015 05:46:53 AM (11 years ago)

Author:

westonruter

Message:

Customize: Fix live previewing of menu changes on subdirectory installs.

Props adamsilverstein, westonruter.
Fixes #33916.

File:

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

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

@@ -935 +935 @@
                         'renderNonceValue'      => wp_create_nonce( self::RENDER_AJAX_ACTION ),
                         'renderNoncePostKey'    => self::RENDER_NONCE_POST_KEY,
-                        'requestUri'            => '/',
+                        'requestUri'            => empty( $_SERVER['REQUEST_URI'] ) ? home_url( '/' ) : esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
                         'theme'                 => array(
                                 'stylesheet' => $this->manager->get_stylesheet(),
@@ -944 +944 @@
                 );
 
-                if ( ! empty( $_SERVER['REQUEST_URI'] ) ) {
-                        $exports['requestUri'] = esc_url_raw( home_url( wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
-                }
-
                 printf( '<script>var _wpCustomizePreviewNavMenusExports = %s;</script>', wp_json_encode( $exports ) );
         }