sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Networks and Sites: Link to Nginx documentation on Network Setup screen when Nginx is in use.

Browse Source 
Props lipathor, audrasjb, johnbillion, flixos90.
Fixes #41166.

git-svn-id: https://develop.svn.wordpress.org/trunk@47632 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2020-04-29 14:41:42 +00:00
parent 3d932981e2
commit 833ce3b15b
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/wp-admin/includes/network.php
View File

@ -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() ) {
?>