From b28de3ea1bbc4256c7b4eccebb3417c9e8507ac0 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 28 Jun 2012 20:38:16 +0000
Subject: [PATCH] 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
---
 wp-includes/ms-functions.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index f4fe306b7d..b8453c730b 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -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', '');