WordPress.org

Make WordPress Core


Ignore:
Timestamp:
09/20/2016 09:38:08 PM (4 years ago)
Author:
jeremyfelt
Message:

Multisite: Revert [38388].

Restore get_current_site() to a multisite only function. Providing this in single site may be a possibility in the future, but should have a dedicated ticket and discussion.

See #37699.

File:
1 edited

Legend:

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

    r38611 r38636  
    32583258    $current_site = get_current_site();
    32593259
    3260     if ( 'relative' == $scheme ) {
     3260    if ( 'relative' == $scheme )
    32613261        $url = $current_site->path;
    3262     } else {
     3262    else
    32633263        $url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
    3264     }
    3265 
    3266     if ( $path && is_string( $path ) ) {
     3264
     3265    if ( $path && is_string( $path ) )
    32673266        $url .= ltrim( $path, '/' );
    3268     }
    32693267
    32703268    /**
     
    33063304        $scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
    33073305
    3308     if ( 'relative' == $scheme ) {
     3306    if ( 'relative' == $scheme )
    33093307        $url = $current_site->path;
    3310     } else {
     3308    else
    33113309        $url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
    3312     }
    3313 
    3314     if ( $path && is_string( $path ) ) {
     3310
     3311    if ( $path && is_string( $path ) )
    33153312        $url .= ltrim( $path, '/' );
    3316     }
    33173313
    33183314    /**
Note: See TracChangeset for help on using the changeset viewer.