diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:51:22 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:51:22 +0000 |
commit | fc0a79914946dac00ccd51b1aacffe267de7210e (patch) | |
tree | 1403384efbfe8f8776ff60aaa40f7d535c02c822 /wp-includes/ms-default-constants.php | |
parent | Releasing progress-linux version 6.5.5+dfsg1-1~progress7.99u1. (diff) | |
download | wordpress-fc0a79914946dac00ccd51b1aacffe267de7210e.tar.xz wordpress-fc0a79914946dac00ccd51b1aacffe267de7210e.zip |
Merging upstream version 6.6.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'wp-includes/ms-default-constants.php')
-rw-r--r-- | wp-includes/ms-default-constants.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/wp-includes/ms-default-constants.php b/wp-includes/ms-default-constants.php index 99d6461..3638c3d 100644 --- a/wp-includes/ms-default-constants.php +++ b/wp-includes/ms-default-constants.php @@ -147,7 +147,8 @@ function ms_subdomain_constants() { ); if ( $subdomain_error_warn ) { - trigger_error( + wp_trigger_error( + __FUNCTION__, sprintf( /* translators: 1: VHOST, 2: SUBDOMAIN_INSTALL */ __( '<strong>Conflicting values for the constants %1$s and %2$s.</strong> The value of %2$s will be assumed to be your subdomain configuration setting.' ), |