WordPress.org

Make WordPress Core

Changeset 13882


Ignore:
Timestamp:
03/29/2010 08:25:30 PM (8 years ago)
Author:
ryan
Message:

Don't stomp scheme arg. see #12736

File:
1 edited

Legend:

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

    r13881 r13882  
    18321832function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
    18331833    $orig_scheme = $scheme;
    1834     $scheme      = is_ssl() && !is_admin() ? 'https' : 'http';
     1834
     1835    if ( !in_array($scheme, array('http', 'https')) )
     1836        $scheme = is_ssl() && !is_admin() ? 'https' : 'http';
    18351837
    18361838    if ( empty($blog_id) || !is_multisite() )
     
    20752077    global $current_site;
    20762078    $orig_scheme = $scheme;
    2077     $scheme      = is_ssl() && !is_admin() ? 'https' : 'http';
     2079
     2080    if ( !in_array($scheme, array('http', 'https')) )
     2081        $scheme = is_ssl() && !is_admin() ? 'https' : 'http';
    20782082
    20792083    $url = 'http://' . $current_site->domain . $current_site->path;
Note: See TracChangeset for help on using the changeset viewer.