From 833ce3b15bb145372d73a76d8854509535711e2b Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 29 Apr 2020 14:41:42 +0000 Subject: [PATCH] =?UTF-8?q?Networks=20and=20Sites:=C2=A0Link=20to=20Nginx?= =?UTF-8?q?=20documentation=20on=20Network=20Setup=20screen=20when=20Nginx?= =?UTF-8?q?=20is=20in=20use.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Props lipathor, audrasjb, johnbillion, flixos90. Fixes #41166. git-svn-id: https://develop.svn.wordpress.org/trunk@47632 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/network.php | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/wp-admin/includes/network.php b/src/wp-admin/includes/network.php index 70cb14ea93..481fd94982 100644 --- a/src/wp-admin/includes/network.php +++ b/src/wp-admin/includes/network.php @@ -378,12 +378,13 @@ function network_step1( $errors = false ) { * * @since 3.0.0 * - * @global wpdb $wpdb WordPress database abstraction object. + * @global wpdb $wpdb WordPress database abstraction object. + * @global bool $is_nginx Whether the server software is Nginx or something else. * * @param WP_Error $errors */ function network_step2( $errors = false ) { - global $wpdb; + global $wpdb, $is_nginx; $hostname = get_clean_basedomain(); $slashed_home = trailingslashit( get_option( 'home' ) ); @@ -616,7 +617,17 @@ define('BLOG_ID_CURRENT_SITE', 1);

'; + printf( + /* translators: %s: Documentation URL. */ + __( 'It seems your network is running with Nginx web server. Learn more about further configuration.' ), + __( 'https://wordpress.org/support/article/nginx/' ) + ); + echo '

'; + + else : // End $is_nginx. Construct an .htaccess file instead: $ms_files_rewriting = ''; if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) { @@ -658,7 +669,7 @@ EOF;