Ticket #20582: cors-test.patch

wp-includes/js/customize-loader.dev.js

@@ -8 +8 @@
         Loader = $.extend( {}, api.Events, {
                 supports: {
                         history:  !! ( window.history && history.pushState ),
-                        hashchange: ('onhashchange' in window) && (document.documentMode === undefined || document.documentMode > 7)
+                        hashchange: ('onhashchange' in window) && (document.documentMode === undefined || document.documentMode > 7),
+                        cors: (function(){ var xhr = new XMLHttpRequest(); return ( 'withCredentials' in xhr ); })()
                 },
 
                 initialize: function() {
@@ -128 +129 @@
         });
 
         $( function() {
+                var url, home;
+
+                if ( ! Loader.supports.cors ) {
+                        url = wpCustomizeLoaderL10n.url.replace(/https?:\/\//, '');
+                        home = wpCustomizeLoaderL10n.home.replace(/https?:\/\//, '');
+
+                        if ( url.indexOf( home ) == -1 ) {
+                                // no cors and x-domain, bail
+                        }
+                }
+
                 if ( window.postMessage )
                         Loader.initialize();
         });

wp-includes/theme.php

@@ -1589 +1589 @@
  * @since 3.4.0
  */
 function _wp_customize_loader_localize() {
-        $l10n = array( 'url'  => admin_url( 'admin.php' ) );
+        $l10n = array( 'url'  => admin_url( 'admin.php' ), 'home' => home_url() );
 
         if ( is_admin() )
                 $l10n[ 'back' ] = sprintf( __( '← Return to %s' ), get_admin_page_title() );
@@ -1605 +1605 @@
  */
 function wp_customize_url( $stylesheet ) {
         return esc_url( admin_url( 'customize.php' ) . '?theme=' . $stylesheet );
-}
- No newline at end of file
+}