diff --git a/wp-includes/ms-default-constants.php b/wp-includes/ms-default-constants.php
index 016ed437b7..128b47b9ae 100644
--- a/wp-includes/ms-default-constants.php
+++ b/wp-includes/ms-default-constants.php
@@ -143,11 +143,21 @@ function ms_subdomain_constants() {
'wp-config.php
',
'is_subdomain_install()
'
);
+
if ( $subdomain_error_warn ) {
- trigger_error( __( 'Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL. The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.' ) . ' ' . $vhost_deprecated, E_USER_WARNING );
+ trigger_error(
+ sprintf(
+ /* translators: 1: VHOST, 2: SUBDOMAIN_INSTALL */
+ __( 'Conflicting values for the constants %1$s and %2$s. The value of %2$s will be assumed to be your subdomain configuration setting.' ),
+ 'VHOST
',
+ 'SUBDOMAIN_INSTALL
'
+ ) . ' ' . $vhost_deprecated,
+ E_USER_WARNING
+ );
} else {
_deprecated_argument( 'define()', '3.0.0', $vhost_deprecated );
}
+
return;
}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a5ba84fba1..5363599934 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
-$wp_version = '6.1-alpha-53698';
+$wp_version = '6.1-alpha-53699';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.