Changeset 34279 for branches/4.3

Timestamp:

09/18/2015 05:49:20 AM (9 years ago)

Author:

westonruter

Message:

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

Merges [34278] from trunk.

Props adamsilverstein, westonruter.
Fixes #33916 for 4.3.

Location:

branches/4.3

Files:

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

branches/4.3/src/wp-includes/class-wp-customize-nav-menus.php

@@ -931 +931 @@
             '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(),
@@ -940 +940 @@
         );
 
-        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 ) );
     }