From fc0a79914946dac00ccd51b1aacffe267de7210e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:51:22 +0200 Subject: Merging upstream version 6.6.1+dfsg1. Signed-off-by: Daniel Baumann --- wp-includes/ms-site.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'wp-includes/ms-site.php') diff --git a/wp-includes/ms-site.php b/wp-includes/ms-site.php index 65e7d8d..6e19758 100644 --- a/wp-includes/ms-site.php +++ b/wp-includes/ms-site.php @@ -524,11 +524,7 @@ function wp_prepare_site_data( $data, $defaults, $old_site = null ) { function wp_normalize_site_data( $data ) { // Sanitize domain if passed. if ( array_key_exists( 'domain', $data ) ) { - $data['domain'] = trim( $data['domain'] ); - $data['domain'] = preg_replace( '/\s+/', '', sanitize_user( $data['domain'], true ) ); - if ( is_subdomain_install() ) { - $data['domain'] = str_replace( '@', '', $data['domain'] ); - } + $data['domain'] = preg_replace( '/[^a-z0-9\-.:]+/i', '', $data['domain'] ); } // Sanitize path if passed. -- cgit v1.2.3