install_blog() should not be polluting the siteurl and home options with the trailing slash that comes from get_blogaddress_by_id().

git-svn-id: http://core.svn.wordpress.org/trunk@21172 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-06-28 20:38:16 +00:00
parent a90957aca0
commit b28de3ea1b

View File

@ -1150,10 +1150,11 @@ function install_blog($blog_id, $blog_title = '') {
populate_roles();
$wp_roles->_init();
$url = untrailingslashit( $url );
// fix url.
update_option('siteurl', $url);
update_option('home', $url);
update_option('fileupload_url', $url . "files" );
update_option('fileupload_url', $url . "/files" );
update_option('upload_path', UPLOADBLOGSDIR . "/$blog_id/files");
update_option('blogname', stripslashes( $blog_title ) );
update_option('admin_email', '');