golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more use get_blogaddress_by_name, see #12735 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14705 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
wpmuguru 2010-05-16 23:00:48 +00:00
parent 3c97397d03
commit f77a0f2bfd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/export.php
View File

@ -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' );

4
wp-admin/includes/upgrade.php
View File

@ -198,7 +198,7 @@ function wp_install_defaults($user_id) {
if ( empty($first_post) )
$first_post = stripslashes( __( 'Welcome to <a href="SITE_URL">SITE_NAME</a>. 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.<br />To delete a comment, just log in and view the post&#039;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(