Changeset 20829

Timestamp:

05/18/2012 08:09:53 PM (13 years ago)

Author:

ryan

Message:

Load the customize preview over ssl if the customize admin page is loaded over ssl and the frontend and admin are on the same domain. This avoids insecure content warnings and allows a more complete preview in browsers such as Chrome that block loading of css until user confirmation allows mixed content loading. see #20702

File:

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

trunk/wp-includes/customize-controls.php

@@ -93 +93 @@
     do_action( 'customize_controls_print_footer_scripts' );
 
+    // If the frontend and the admin are served from the same domain, load the
+    // preview over ssl if the customizer is being loaded over ssl. This avoids
+    // insecure content warnings. This is not attempted if the admin and frontend
+    // are on different domains to avoid the case where the frontend doesn't have
+    // ssl certs. Domain mapping plugins can force ssl in these conditions using
+    // the customize_preview_link filter.
+    $admin_origin = parse_url( admin_url() );
+    $home_origin = parse_url( home_url() );
+    $scheme = null;
+    if ( is_ssl() && ( $admin_origin[ 'host' ] == $home_origin[ 'host' ] ) )
+        $scheme = 'https';
+
+    $preview_url = apply_filters( 'customize_preview_link',  home_url( '/', $scheme ) );
+
     $settings = array(
         'theme'    => array(
@@ -99 +113 @@
         ),
         'url'      => array(
-            'preview'  => esc_url( home_url( '/' ) ),
+            'preview'  => esc_url( $preview_url ),
             'parent'   => esc_url( admin_url() ),
             'ajax'     => esc_url( admin_url( 'admin-ajax.php', 'relative' ) ),