Changeset 20886 for trunk/wp-admin/customize.php

Timestamp:

05/24/2012 09:13:21 PM (13 years ago)

Author:

koopersmith

Message:

Theme Customizer: Check for CORS support when the preview and admin urls are cross-domain. Add a fallback to the customize control frame, and check support there as well. see #20582, #19910.

File:

• trunk/wp-admin/customize.php (modified) (2 diffs)

trunk/wp-admin/customize.php

@@ -108 +108 @@
     $admin_origin = parse_url( admin_url() );
     $home_origin  = parse_url( home_url() );
+    $cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) );
 
-    if ( is_ssl() && ( $admin_origin[ 'host' ] == $home_origin[ 'host' ] ) )
+    if ( is_ssl() && ! $cross_domain )
         $allowed_urls[] = home_url( '/', 'https' );
 
     $allowed_urls = array_unique( apply_filters( 'customize_allowed_urls', $allowed_urls ) );
+
+    $fallback_url = add_query_arg( array(
+        'preview'        => 1,
+        'template'       => $wp_customize->get_template(),
+        'stylesheet'     => $wp_customize->get_stylesheet(),
+        'preview_iframe' => true,
+        'TB_iframe'      => 'true'
+    ), home_url( '/' ) );
 
     $settings = array(
@@ -120 +129 @@
         ),
         'url'      => array(
-            'preview'  => esc_url( home_url( '/' ) ),
-            'parent'   => esc_url( admin_url() ),
-            'ajax'     => esc_url( admin_url( 'admin-ajax.php', 'relative' ) ),
-            'allowed'  => array_map( 'esc_url', $allowed_urls ),
+            'preview'       => esc_url( home_url( '/' ) ),
+            'parent'        => esc_url( admin_url() ),
+            'ajax'          => esc_url( admin_url( 'admin-ajax.php', 'relative' ) ),
+            'allowed'       => array_map( 'esc_url', $allowed_urls ),
+            'isCrossDomain' => $cross_domain,
+            'fallback'      => $fallback_url,
         ),
         'settings' => array(),