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

Revert [16987]. This pollutes home and siteurl during signup and blog creation. see #14867 

git-svn-id: http://svn.automattic.com/wordpress/trunk@17005 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-12-16 19:48:00 +00:00
parent b9c491d090
commit 4e7270ab6a
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,15 +30,11 @@ function wpmu_update_blogs_date() {
* @since MU
*
* @param int $blog_id Blog ID
* @param string $scheme Optional. Scheme to give the URL. Currently 'http', 'https'
* @return string
*/
function get_blogaddress_by_id( $blog_id, $scheme = null ) {
if ( ! in_array( $scheme, array( 'http', 'https' ) ) )
$scheme = is_ssl() ? 'https' : 'http';
function get_blogaddress_by_id( $blog_id ) {
$bloginfo = get_blog_details( (int) $blog_id, false ); // only get bare details!
return esc_url( "$scheme://" . $bloginfo->domain . $bloginfo->path );
return esc_url( 'http://' . $bloginfo->domain . $bloginfo->path );
}
/**
@ -71,24 +67,20 @@ function get_blogaddress_by_name( $blogname ) {
*
* @param string $domain
* @param string $path
* @param string $scheme Optional. Scheme to give the URL. Currently 'http', 'https'
* @return string
*/
function get_blogaddress_by_domain( $domain, $path, $scheme = null ) {
if ( ! in_array( $scheme, array( 'http', 'https' ) ) )
$scheme = is_ssl() ? 'https' : 'http';
function get_blogaddress_by_domain( $domain, $path ) {
if ( is_subdomain_install() ) {
$url = "$scheme://" . $domain.$path;
$url = "http://".$domain.$path;
} else {
if ( $domain != $_SERVER['HTTP_HOST'] ) {
$blogname = substr( $domain, 0, strpos( $domain, '.' ) );
$url = "$scheme://" . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path;
$url = 'http://' . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path;
// we're not installing the main blog
if ( $blogname != 'www.' )
$url .= $blogname . '/';
} else { // main blog
$url = "$scheme://" . $domain . $path;
$url = 'http://' . $domain . $path;
}
}
return esc_url( $url );