From e4550efbb780117a417ca2f8417d2c8c7e0b0db1 Mon Sep 17 00:00:00 2001 From: Felix Arntz Date: Sat, 14 Oct 2017 22:46:48 +0000 Subject: [PATCH] Multisite: Return `get_current_blog_id()` value instead of hard-coded 1 in `get_main_site_id()` for non-multisite environments. See #41936. Built from https://develop.svn.wordpress.org/trunk@41862 git-svn-id: http://core.svn.wordpress.org/trunk@41696 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/functions.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 87eef314ca..56a444b0f2 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -4423,7 +4423,7 @@ function is_main_site( $site_id = null, $network_id = null ) { */ function get_main_site_id( $network_id = null ) { if ( ! is_multisite() ) { - return 1; + return get_current_blog_id(); } $network = get_network( $network_id ); diff --git a/wp-includes/version.php b/wp-includes/version.php index d634272de2..c6c314a537 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9-beta2-41861'; +$wp_version = '4.9-beta2-41862'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.