From 309ae4c917ff96df7eb567980d320447a98d6ce2 Mon Sep 17 00:00:00 2001 From: Andrew Nacin 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: https://develop.svn.wordpress.org/trunk@21172 602fd350-edb4-49c9-b593-d223f7449a82 --- 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', '');