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

Deprecate get_blogaddress_by_domain(), unused since [25261]. props jeremyfelt. fixes #25235. 

Built from https://develop.svn.wordpress.org/trunk@25276


git-svn-id: http://core.svn.wordpress.org/trunk@25241 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2013-09-06 11:41:09 +00:00
parent db6cf37f91
commit 14308c0d41
2 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,32 +55,6 @@ function get_blogaddress_by_name( $blogname ) {
return esc_url( $url . '/' );
}
/**
* Get a full blog URL, given a domain and a path.
*
* @since MU
*
* @param string $domain
* @param string $path
* @return string
*/
function get_blogaddress_by_domain( $domain, $path ) {
if ( is_subdomain_install() ) {
$url = "http://" . $domain.$path;
} else {
if ( $domain != $_SERVER['HTTP_HOST'] ) {
$blogname = substr( $domain, 0, strpos( $domain, '.' ) );
$url = 'http://' . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path;
// we're not installing the main blog
if ( $blogname != 'www.' )
$url .= $blogname . '/';
} else { // main blog
$url = 'http://' . $domain . $path;
}
}
return esc_url_raw( $url );
}
/**
* Given a blog's (subdomain or directory) slug, retrieve its id.
*

29
wp-includes/ms-deprecated.php
View File

@ -316,3 +316,32 @@ function get_user_id_from_string( $string ) {
return $user->ID;
return 0;
}
/**
* Get a full blog URL, given a domain and a path.
*
* @since MU
* @deprecated 3.7.0
*
* @param string $domain
* @param string $path
* @return string
*/
function get_blogaddress_by_domain( $domain, $path ) {
_deprecated_function( __FUNCTION__, '3.7' );
if ( is_subdomain_install() ) {
$url = "http://" . $domain.$path;
} else {
if ( $domain != $_SERVER['HTTP_HOST'] ) {
$blogname = substr( $domain, 0, strpos( $domain, '.' ) );
$url = 'http://' . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path;
// we're not installing the main blog
if ( $blogname != 'www.' )
$url .= $blogname . '/';
} else { // main blog
$url = 'http://' . $domain . $path;
}
}
return esc_url_raw( $url );
}