From 2ecde55219213c82c46026b3745074759a7c6924 Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Fri, 20 Mar 2020 20:58:37 +0100 Subject: [PATCH 1/2] proposed patch --- src/wp-includes/ms-settings.php | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/wp-includes/ms-settings.php b/src/wp-includes/ms-settings.php index 1aff91ac66b03..50ec5440365b7 100644 --- a/src/wp-includes/ms-settings.php +++ b/src/wp-includes/ms-settings.php @@ -54,13 +54,21 @@ // have not been populated in the global scope through something like `sunrise.php`. if ( ! isset( $current_site ) || ! isset( $current_blog ) ) { - $domain = strtolower( stripslashes( $_SERVER['HTTP_HOST'] ) ); - if ( substr( $domain, -3 ) == ':80' ) { - $domain = substr( $domain, 0, -3 ); - $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -3 ); - } elseif ( substr( $domain, -4 ) == ':443' ) { - $domain = substr( $domain, 0, -4 ); - $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 ); + $domain = 'notdefined'; + + if ( isset( $_SERVER['SERVER_NAME'] ) && ! empty( $_SERVER['SERVER_NAME'] ) ) { + $domain = $_SERVER['SERVER_NAME']; + } + + if ( isset( $_SERVER['HTTP_HOST'] ) { + $domain = strtolower( stripslashes( $_SERVER['HTTP_HOST'] ) ); + if ( substr( $domain, -3 ) == ':80' ) { + $domain = substr( $domain, 0, -3 ); + $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -3 ); + } elseif ( substr( $domain, -4 ) == ':443' ) { + $domain = substr( $domain, 0, -4 ); + $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 ); + } } $path = stripslashes( $_SERVER['REQUEST_URI'] ); From f8124adf0e94481b18b8a5ad6893783e0486e168 Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Mon, 23 Mar 2020 15:54:27 +0100 Subject: [PATCH 2/2] missing parenthesis --- src/wp-includes/ms-settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-includes/ms-settings.php b/src/wp-includes/ms-settings.php index 50ec5440365b7..cf64c0021cbd4 100644 --- a/src/wp-includes/ms-settings.php +++ b/src/wp-includes/ms-settings.php @@ -60,7 +60,7 @@ $domain = $_SERVER['SERVER_NAME']; } - if ( isset( $_SERVER['HTTP_HOST'] ) { + if ( isset( $_SERVER['HTTP_HOST'] ) ) { $domain = strtolower( stripslashes( $_SERVER['HTTP_HOST'] ) ); if ( substr( $domain, -3 ) == ':80' ) { $domain = substr( $domain, 0, -3 );