Ticket #33620: 33620.diff

wp-includes/ms-functions.php

@@ -1409 +1409 @@
 
         $url = untrailingslashit( $url );
 
+        if ( defined( 'SUBDOMAIN_INSTALL' ) && SUBDOMAIN_INSTALL === false){
+                $siteurl = parse_url( get_site_option( 'siteurl' ) );
+
+                if ( $siteurl['scheme'] == 'https' ) {
+                        $url = set_url_scheme( $url, 'https' );
+                }
+
+        }
+
         update_option( 'siteurl', $url );
         update_option( 'home', $url );