diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-includes/ms-default-constants.php
--- a/wp/wp-includes/ms-default-constants.php	Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-includes/ms-default-constants.php	Mon Oct 14 17:39:30 2019 +0200
@@ -16,8 +16,6 @@
  * @since 3.0.0
  */
 function ms_upload_constants() {
-	global $wpdb;
-
 	// This filter is attached in ms-default-filters.php but that file is not included during SHORTINIT.
 	add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
 
@@ -31,11 +29,13 @@
 	// Note, the main site in a post-MU network uses wp-content/uploads.
 	// This is handled in wp_upload_dir() by ignoring UPLOADS for this case.
 	if ( ! defined( 'UPLOADS' ) ) {
-		define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
+		$site_id = get_current_blog_id();
+
+		define( 'UPLOADS', UPLOADBLOGSDIR . '/' . $site_id . '/files/' );
 
 		// Uploads dir relative to ABSPATH
 		if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) )
-			define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
+			define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . '/blogs.dir/' . $site_id . '/files/' );
 	}
 }
 
@@ -45,19 +45,19 @@
  * @since 3.0.0
  */
 function ms_cookie_constants(  ) {
-	$current_site = get_current_site();
+	$current_network = get_network();
 
 	/**
 	 * @since 1.2.0
 	 */
 	if ( !defined( 'COOKIEPATH' ) )
-		define( 'COOKIEPATH', $current_site->path );
+		define( 'COOKIEPATH', $current_network->path );
 
 	/**
 	 * @since 1.5.0
 	 */
 	if ( !defined( 'SITECOOKIEPATH' ) )
-		define( 'SITECOOKIEPATH', $current_site->path );
+		define( 'SITECOOKIEPATH', $current_network->path );
 
 	/**
 	 * @since 2.6.0
@@ -74,10 +74,10 @@
 	 * @since 2.0.0
 	 */
 	if ( !defined('COOKIE_DOMAIN') && is_subdomain_install() ) {
-		if ( !empty( $current_site->cookie_domain ) )
-			define('COOKIE_DOMAIN', '.' . $current_site->cookie_domain);
+		if ( !empty( $current_network->cookie_domain ) )
+			define('COOKIE_DOMAIN', '.' . $current_network->cookie_domain);
 		else
-			define('COOKIE_DOMAIN', '.' . $current_site->domain);
+			define('COOKIE_DOMAIN', '.' . $current_network->domain);
 	}
 }
 
@@ -114,6 +114,9 @@
  * we will have translations loaded and can trigger warnings easily.
  *
  * @since 3.0.0
+ *
+ * @staticvar bool $subdomain_error
+ * @staticvar bool $subdomain_error_warn
  */
 function ms_subdomain_constants() {
 	static $subdomain_error = null;
@@ -124,11 +127,18 @@
 	}
 
 	if ( $subdomain_error ) {
-		$vhost_deprecated = __( 'The constant <code>VHOST</code> <strong>is deprecated</strong>. Use the boolean constant <code>SUBDOMAIN_INSTALL</code> in wp-config.php to enable a subdomain configuration. Use is_subdomain_install() to check whether a subdomain configuration is enabled.' );
+		$vhost_deprecated = sprintf(
+			/* translators: 1: VHOST, 2: SUBDOMAIN_INSTALL, 3: wp-config.php, 4: is_subdomain_install() */
+			__( 'The constant %1$s <strong>is deprecated</strong>. Use the boolean constant %2$s in %3$s to enable a subdomain configuration. Use %4$s to check whether a subdomain configuration is enabled.' ),
+			'<code>VHOST</code>',
+			'<code>SUBDOMAIN_INSTALL</code>',
+			'<code>wp-config.php</code>',
+			'<code>is_subdomain_install()</code>'
+		);
 		if ( $subdomain_error_warn ) {
 			trigger_error( __( '<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.' ) . ' ' . $vhost_deprecated, E_USER_WARNING );
 		} else {
-	 		_deprecated_argument( 'define()', '3.0', $vhost_deprecated );
+	 		_deprecated_argument( 'define()', '3.0.0', $vhost_deprecated );
 		}
 		return;
 	}
@@ -150,4 +160,3 @@
 		define( 'VHOST', 'no' );
 	}
 }
-add_action( 'init', 'ms_subdomain_constants' );