Context Navigation

Ticket #39311: fix-multisite.39311.3.diff

File fix-multisite.39311.3.diff, 1.0 KB (added by pkarjala, 7 years ago)
Add Subfolder check to network_site_url() and network_home_url() calls.

diff --git wp-includes/link-template.php wp-includes/link-template.php
index 77b18c6fca..7e29cfa82d 100644

		function network_site_url( $path = '', $scheme = null ) {
3373	3373	$url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
3374	3374	}
3375	3375
	3376	if ( SUBDOMAIN_INSTALL === false ) {
	3377	$current_blog = get_blog_details();
	3378	if ( $current_blog->path != '/' ) {
	3379	$path = $current_blog->path . $path;
	3380	}
	3381	}
	3382
3376	3383	if ( $path && is_string( $path ) ) {
3377	3384	$url .= ltrim( $path, '/' );
3378	3385	}
…	…	function network_home_url( $path = '', $scheme = null ) {
3423	3430	$url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
3424	3431	}
3425	3432
	3433	if ( SUBDOMAIN_INSTALL === false ) {
	3434	$current_blog = get_blog_details();
	3435	if ( $current_blog->path != '/' ) {
	3436	$path = $current_blog->path . $path;
	3437	}
	3438	}
	3439
3426	3440	if ( $path && is_string( $path ) ) {
3427	3441	$url .= ltrim( $path, '/' );
3428	3442	}