Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

Add scheme arguments to get_blogaddress_by_domain and get_blogaddress_by_id. props adambackstrom for initial patch, fixes #14867.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16987 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-12-16 07:58:57 +00:00
parent 31b4959b1b
commit 0b1b0f86ab
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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