WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Built from https://develop.svn.wordpress.org/trunk@34916


git-svn-id: http://core.svn.wordpress.org/trunk@34881 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2015-10-07 21:46:25 +00:00
parent 45230b5fc7
commit 9daa848297
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-includes/ms-functions.php
View File

@ -1317,7 +1317,7 @@ function insert_blog($domain, $path, $site_id) {
* @param string $blog_title The title of the new site. * @param string $blog_title The title of the new site.
*/ */
function install_blog( $blog_id, $blog_title = '' ) { function install_blog( $blog_id, $blog_title = '' ) {
global $wpdb, $wp_roles; global $wpdb, $wp_roles, $current_site;
// Cast for security // Cast for security
$blog_id = (int) $blog_id; $blog_id = (int) $blog_id;
@ -1339,10 +1339,21 @@ function install_blog( $blog_id, $blog_title = '' ) {
// populate_roles() clears previous role definitions so we start over. // populate_roles() clears previous role definitions so we start over.
$wp_roles = new WP_Roles(); $wp_roles = new WP_Roles();
$url = untrailingslashit( $url ); $siteurl = $home = untrailingslashit( $url );
update_option( 'siteurl', $url ); if ( ! is_subdomain_install() ) {
update_option( 'home', $url );
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' ) ) if ( get_site_option( 'ms_files_rewriting' ) )
update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" ); update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34915'; $wp_version = '4.4-alpha-34916';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.