Make WordPress Core

Ticket #23221: 23221.2.diff

File 23221.2.diff, 637 bytes (added by markoheijnen, 12 years ago)

Should not have used site_url for this

  • wp-includes/link-template.php

    diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
    index 1daf487..9bb2c6d 100644
    a b function network_site_url( $path = '', $scheme = null ) { 
    21072107        if ( ! is_multisite() )
    21082108                return site_url($path, $scheme);
    21092109
    2110         if ( 'relative' == $scheme )
    2111                 $url = $current_site->path;
    2112         else
    2113                 $url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
     2110        $url = get_site_option('siteurl');
     2111
     2112        $url = set_url_scheme( $url, $scheme );
    21142113
    21152114        if ( $path && is_string( $path ) )
    21162115                $url .= ltrim( $path, '/' );