diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-includes/ms-default-constants.php --- a/wp/wp-includes/ms-default-constants.php Tue Oct 22 16:11:46 2019 +0200 +++ b/wp/wp-includes/ms-default-constants.php Tue Dec 15 13:49:49 2020 +0100 @@ -23,7 +23,7 @@ return; } - // Base uploads dir relative to ABSPATH + // Base uploads dir relative to ABSPATH. if ( ! defined( 'UPLOADBLOGSDIR' ) ) { define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' ); } @@ -35,8 +35,8 @@ define( 'UPLOADS', UPLOADBLOGSDIR . '/' . $site_id . '/files/' ); - // Uploads dir relative to ABSPATH - if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) ) { + // Uploads dir relative to ABSPATH. + if ( 'wp-content/blogs.dir' === UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) ) { define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . '/blogs.dir/' . $site_id . '/files/' ); } } @@ -124,9 +124,6 @@ * 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; @@ -155,7 +152,7 @@ if ( defined( 'SUBDOMAIN_INSTALL' ) && defined( 'VHOST' ) ) { $subdomain_error = true; - if ( SUBDOMAIN_INSTALL !== ( 'yes' == VHOST ) ) { + if ( SUBDOMAIN_INSTALL !== ( 'yes' === VHOST ) ) { $subdomain_error_warn = true; } } elseif ( defined( 'SUBDOMAIN_INSTALL' ) ) { @@ -163,7 +160,7 @@ define( 'VHOST', SUBDOMAIN_INSTALL ? 'yes' : 'no' ); } elseif ( defined( 'VHOST' ) ) { $subdomain_error = true; - define( 'SUBDOMAIN_INSTALL', 'yes' == VHOST ); + define( 'SUBDOMAIN_INSTALL', 'yes' === VHOST ); } else { $subdomain_error = false; define( 'SUBDOMAIN_INSTALL', false );