diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-06-28 18:30:15 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-06-28 18:30:15 +0000 |
| commit | 4d8d816c3aebb0122c91d3205d9faed39c8ad086 (patch) | |
| tree | 694f58e5b429fe13f4de2a525205f5adcccf6254 /wp-includes/wpmu-functions.php | |
| parent | e9d213e17e7e7779838d5e41b27c4a00659d30ae (diff) | |
| download | wordpress-mu-4d8d816c3aebb0122c91d3205d9faed39c8ad086.tar.gz wordpress-mu-4d8d816c3aebb0122c91d3205d9faed39c8ad086.tar.xz wordpress-mu-4d8d816c3aebb0122c91d3205d9faed39c8ad086.zip | |
Sync some files
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@613 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/wpmu-functions.php')
| -rw-r--r-- | wp-includes/wpmu-functions.php | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php index 42a0ea9..afffd2c 100644 --- a/wp-includes/wpmu-functions.php +++ b/wp-includes/wpmu-functions.php @@ -84,7 +84,11 @@ function get_blogaddress_by_id( $blog_id ) { $bloginfo = get_blog_details( $blog_id, false ); // only get bare details! - return get_real_siteurl( $bloginfo->domain, $bloginfo->path ); + if( defined( "VHOST" ) && constant( "VHOST" ) == 'yes' ) { + return "http://" . $bloginfo->domain . $bloginfo->path; + } else { + return get_blogaddress_by_domain($bloginfo->domain, $bloginfo->path); + } } function get_blogaddress_by_name( $blogname ) { @@ -1344,12 +1348,4 @@ SITE_NAME" ); wp_mail($user->user_email, $subject, $message, $message_headers); } -function get_real_siteurl( $domain, $path ) { - if( defined( "VHOST" ) && constant( "VHOST" ) == 'yes' ) { - return "http://" . $domain . $path; - } else { - return get_blogaddress_by_domain($domain, $path); - } -} - ?> |