diff -r 7b1b88e27a20 -r 48c4eec2b7e6 wp/wp-includes/ms-default-constants.php
--- a/wp/wp-includes/ms-default-constants.php Thu Sep 29 08:06:27 2022 +0200
+++ b/wp/wp-includes/ms-default-constants.php Fri Sep 05 18:40:08 2025 +0200
@@ -28,8 +28,10 @@
define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
}
- // 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.
+ /*
+ * 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' ) ) {
$site_id = get_current_blog_id();
@@ -143,11 +145,22 @@
'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 );
+ wp_trigger_error(
+ __FUNCTION__,
+ 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;
}