Changeset 34916 for trunk/src/wp-includes/ms-functions.php

Timestamp:

10/07/2015 09:45:17 PM (9 years ago)

Author:

johnbillion

Message:

Correctly set the scheme of the home and siteurl options when creating a new site on multisite that uses some combination of HTTPS in the admin area or on the front end.

Fixes #33620
Props tryon, johnbillion

File:

• trunk/src/wp-includes/ms-functions.php (modified) (2 diffs)

trunk/src/wp-includes/ms-functions.php

@@ -1318 +1318 @@
  */
 function install_blog( $blog_id, $blog_title = '' ) {
-    global $wpdb, $wp_roles;
+    global $wpdb, $wp_roles, $current_site;
 
     // Cast for security
@@ -1340 +1340 @@
     $wp_roles = new WP_Roles();
 
-    $url = untrailingslashit( $url );
-
-    update_option( 'siteurl', $url );
-    update_option( 'home', $url );
+    $siteurl = $home = untrailingslashit( $url );
+
+    if ( ! is_subdomain_install() ) {
+
+        if ( 'https' === parse_url( get_network_option( 'siteurl' ), PHP_URL_SCHEME ) ) {
+            $siteurl = set_url_scheme( $siteurl, 'https' );
+        }
+        if ( 'https' === parse_url( get_home_url( $current_site->blog_id ), PHP_URL_SCHEME ) ) {
+            $home = set_url_scheme( $home, 'https' );
+        }
+
+    }
+
+    update_option( 'siteurl', $siteurl );
+    update_option( 'home', $home );
 
     if ( get_site_option( 'ms_files_rewriting' ) )