diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-includes/ms-settings.php --- a/wp/wp-includes/ms-settings.php Tue Oct 22 16:11:46 2019 +0200 +++ b/wp/wp-includes/ms-settings.php Tue Dec 15 13:49:49 2020 +0100 @@ -32,19 +32,19 @@ global $current_site, $current_blog, $domain, $path, $site_id, $public; /** WP_Network class */ -require_once( ABSPATH . WPINC . '/class-wp-network.php' ); +require_once ABSPATH . WPINC . '/class-wp-network.php'; /** WP_Site class */ -require_once( ABSPATH . WPINC . '/class-wp-site.php' ); +require_once ABSPATH . WPINC . '/class-wp-site.php'; /** Multisite loader */ -require_once( ABSPATH . WPINC . '/ms-load.php' ); +require_once ABSPATH . WPINC . '/ms-load.php'; /** Default Multisite constants */ -require_once( ABSPATH . WPINC . '/ms-default-constants.php' ); +require_once ABSPATH . WPINC . '/ms-default-constants.php'; if ( defined( 'SUNRISE' ) ) { - include_once( WP_CONTENT_DIR . '/sunrise.php' ); + include_once WP_CONTENT_DIR . '/sunrise.php'; } /** Check for and define SUBDOMAIN_INSTALL and the deprecated VHOST constant. */ @@ -55,10 +55,10 @@ if ( ! isset( $current_site ) || ! isset( $current_blog ) ) { $domain = strtolower( stripslashes( $_SERVER['HTTP_HOST'] ) ); - if ( substr( $domain, -3 ) == ':80' ) { + if ( ':80' === substr( $domain, -3 ) ) { $domain = substr( $domain, 0, -3 ); $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -3 ); - } elseif ( substr( $domain, -4 ) == ':443' ) { + } elseif ( ':443' === substr( $domain, -4 ) ) { $domain = substr( $domain, 0, -4 ); $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 ); } @@ -94,13 +94,13 @@ wp_load_core_site_options( $site_id ); } -$wpdb->set_prefix( $table_prefix, false ); // $table_prefix can be set in sunrise.php +$wpdb->set_prefix( $table_prefix, false ); // $table_prefix can be set in sunrise.php. $wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id ); $table_prefix = $wpdb->get_blog_prefix(); $_wp_switched_stack = array(); $switched = false; -// need to init cache again after blog_id is set +// Need to init cache again after blog_id is set. wp_start_object_cache(); if ( ! $current_site instanceof WP_Network ) { @@ -111,7 +111,7 @@ $current_blog = new WP_Site( $current_blog ); } -// Define upload directory constants +// Define upload directory constants. ms_upload_constants(); /**