From f77a0f2bfde99a209b250fe45e66126572b03bb8 Mon Sep 17 00:00:00 2001 From: wpmuguru Date: Sun, 16 May 2010 23:00:48 +0000 Subject: [PATCH] more use get_blogaddress_by_name, see #12735 git-svn-id: http://svn.automattic.com/wordpress/trunk@14705 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/export.php | 2 +- wp-admin/includes/upgrade.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/includes/export.php b/wp-admin/includes/export.php index 07ee5fb4d4..e289858595 100644 --- a/wp-admin/includes/export.php +++ b/wp-admin/includes/export.php @@ -155,7 +155,7 @@ function export_wp( $args = array() ) { // mu: the base url if ( isset( $current_site->domain ) ) - return 'http://' . $current_site->domain . $current_site->path; + return network_home_url(); // wp: the blog url else return get_bloginfo_rss( 'url' ); diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index 5dc4d3efbe..661bf8cf51 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -198,7 +198,7 @@ function wp_install_defaults($user_id) { if ( empty($first_post) ) $first_post = stripslashes( __( 'Welcome to SITE_NAME. This is your first post. Edit or delete it, then start blogging!' ) ); - $first_post = str_replace( "SITE_URL", esc_url("http://" . $current_site->domain . $current_site->path), $first_post ); + $first_post = str_replace( "SITE_URL", esc_url( network_home_url() ), $first_post ); $first_post = str_replace( "SITE_NAME", $current_site->site_name, $first_post ); } else { $first_post = __('Welcome to WordPress. This is your first post. Edit or delete it, then start blogging!'); @@ -229,7 +229,7 @@ function wp_install_defaults($user_id) { $first_comment = __('Hi, this is a comment.
To delete a comment, just log in and view the post's comments. There you will have the option to edit or delete them.'); if ( is_multisite() ) { $first_comment_author = get_site_option( 'first_comment_author', $first_comment_author ); - $first_comment_url = get_site_option( 'first_comment_url', 'http://' . $current_site->domain . $current_site->path ); + $first_comment_url = get_site_option( 'first_comment_url', network_home_url() ); $first_comment = get_site_option( 'first_comment', $first_comment ); } $wpdb->insert( $wpdb->comments, array(