From 3dc1e33fb5e3062e412a1cf71358d8ff5370bd8d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 29 Apr 2020 14:43:09 +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.
Built from https://develop.svn.wordpress.org/trunk@47632


git-svn-id: http://core.svn.wordpress.org/trunk@47407 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/network.php | 19 +++++++++++++++----
 wp-includes/version.php       |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/wp-admin/includes/network.php b/wp-admin/includes/network.php
index 70cb14ea93..481fd94982 100644
--- a/wp-admin/includes/network.php
+++ b/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);
 	</ol>
 
 		<?php
-	else : // End iis7_supports_permalinks(). Construct an .htaccess file instead:
+	elseif ( $is_nginx ) : // End iis7_supports_permalinks(). Link to Nginx documentation instead:
+
+		echo '<li><p>';
+		printf(
+			/* translators: %s: Documentation URL. */
+			__( 'It seems your network is running with Nginx web server. <a href="%s">Learn more about further configuration</a>.' ),
+			__( 'https://wordpress.org/support/article/nginx/' )
+		);
+		echo '</p></li>';
+
+	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;
 	</ol>
 
 		<?php
-	endif; // End IIS/Apache code branches.
+	endif; // End IIS/Nginx/Apache code branches.
 
 	if ( ! is_multisite() ) {
 		?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e26ed83219..0dfec852e3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-47631';
+$wp_version = '5.5-alpha-47632';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.