WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
This commit is contained in:
Sergey Biryukov 2020-04-29 14:43:09 +00:00
parent 0da2c98ddc
commit 3dc1e33fb5
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -378,12 +378,13 @@ function network_step1( $errors = false ) {
* *
* @since 3.0.0 * @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 * @param WP_Error $errors
*/ */
function network_step2( $errors = false ) { function network_step2( $errors = false ) {
global $wpdb; global $wpdb, $is_nginx;
$hostname = get_clean_basedomain(); $hostname = get_clean_basedomain();
$slashed_home = trailingslashit( get_option( 'home' ) ); $slashed_home = trailingslashit( get_option( 'home' ) );
@ -616,7 +617,17 @@ define('BLOG_ID_CURRENT_SITE', 1);
</ol> </ol>
<?php <?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 = ''; $ms_files_rewriting = '';
if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) { if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
@ -658,7 +669,7 @@ EOF;
</ol> </ol>
<?php <?php
endif; // End IIS/Apache code branches. endif; // End IIS/Nginx/Apache code branches.
if ( ! is_multisite() ) { if ( ! is_multisite() ) {
?> ?>

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.