Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use network_home_url in get_blogaddress_by_name, see #12735 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14703 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
wpmuguru 2010-05-16 22:21:06 +00:00
parent 021179162a
commit 9fb13d2cba
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/ms-blogs.php
View File

@ -29,10 +29,13 @@ function get_blogaddress_by_name( $blogname ) {
if ( is_subdomain_install() ) {
if ( $blogname == 'main' )
$blogname = 'www';
return esc_url( 'http://' . $blogname . '.' . $current_site->domain . $current_site->path );
$url = rtrim( network_home_url(), '/' );
if ( !empty( $blogname ) )
$url = preg_replace( '|^([^\.]+://)|', '$1' . $blogname . '.', $url );
} else {
return esc_url( 'http://' . $current_site->domain . $current_site->path . $blogname . '/' );
$url = network_home_url( $blogname );
}
return esc_url( $url . '/' );
}
function get_blogaddress_by_domain( $domain, $path ){