WordPress.org

Make WordPress Core

Changeset 17005


Ignore:
Timestamp:
12/16/10 19:48:00 (3 years ago)
Author:
ryan
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/ms-blogs.php

    r16987 r17005  
    3131 * 
    3232 * @param int $blog_id Blog ID 
    33  * @param  string $scheme Optional. Scheme to give the URL. Currently 'http', 'https' 
    3433 * @return string 
    3534 */ 
    36 function get_blogaddress_by_id( $blog_id, $scheme = null ) { 
    37     if ( ! in_array( $scheme, array( 'http', 'https' ) ) ) 
    38         $scheme = is_ssl() ? 'https' : 'http'; 
    39  
     35function get_blogaddress_by_id( $blog_id ) { 
    4036    $bloginfo = get_blog_details( (int) $blog_id, false ); // only get bare details! 
    41     return esc_url( "$scheme://" . $bloginfo->domain . $bloginfo->path ); 
     37    return esc_url( 'http://' . $bloginfo->domain . $bloginfo->path ); 
    4238} 
    4339 
     
    7268 * @param string $domain 
    7369 * @param string $path 
    74  * @param  string $scheme Optional. Scheme to give the URL. Currently 'http', 'https' 
    7570 * @return string 
    7671 */ 
    77 function get_blogaddress_by_domain( $domain, $path, $scheme = null ) { 
    78     if ( ! in_array( $scheme, array( 'http', 'https' ) ) ) 
    79         $scheme = is_ssl() ? 'https' : 'http'; 
    80  
     72function get_blogaddress_by_domain( $domain, $path ) { 
    8173    if ( is_subdomain_install() ) { 
    82         $url = "$scheme://" . $domain.$path; 
     74        $url = "http://".$domain.$path; 
    8375    } else { 
    8476        if ( $domain != $_SERVER['HTTP_HOST'] ) { 
    8577            $blogname = substr( $domain, 0, strpos( $domain, '.' ) ); 
    86             $url = "$scheme://" . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path; 
     78            $url = 'http://' . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path; 
    8779            // we're not installing the main blog 
    8880            if ( $blogname != 'www.' ) 
    8981                $url .= $blogname . '/'; 
    9082        } else { // main blog 
    91             $url = "$scheme://" . $domain . $path; 
     83            $url = 'http://' . $domain . $path; 
    9284        } 
    9385    } 
Note: See TracChangeset for help on using the changeset viewer.