Changeset 14705

Timestamp:

05/16/2010 11:00:48 PM (14 years ago)

Author:

wpmuguru

Message:

more use get_blogaddress_by_name, see #12735

Location:

trunk/wp-admin/includes

Files:

• export.php (modified) (1 diff)
• upgrade.php (modified) (2 diffs)

trunk/wp-admin/includes/export.php

@@ -156 +156 @@
         // 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

trunk/wp-admin/includes/upgrade.php

@@ -199 +199 @@
             $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 {
@@ -230 +230 @@
     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 );
     }