WordPress.org

Make WordPress Core

Changeset 21937


Ignore:
Timestamp:
09/21/12 12:36:50 (3 years ago)
Author:
ryan
Message:

Honor https in home option.

fixes #20759

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/link-template.php

    r21919 r21937  
    18931893    $orig_scheme = $scheme; 
    18941894 
    1895     if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) 
    1896         $scheme = is_ssl() && !is_admin() ? 'https' : 'http'; 
    1897  
    18981895    if ( empty( $blog_id ) || !is_multisite() ) { 
    18991896        $url = get_option( 'home' ); 
     
    19021899        $url = get_option( 'home' ); 
    19031900        restore_current_blog(); 
     1901    } 
     1902 
     1903    if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) { 
     1904        if ( is_ssl() && ! is_admin() ) 
     1905            $scheme = 'https'; 
     1906        else 
     1907            $scheme = parse_url( $url, PHP_URL_SCHEME ); 
    19041908    } 
    19051909 
Note: See TracChangeset for help on using the changeset viewer.