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

Permalinks: Don't show "You should update your `.htaccess` file now" message when saving permalink settings on Multisite. 

Multisite routing is taken care of by WordPress, not by the web server.

Follow-up to [13706], [37747], [38066].

Props boonebgorges.
Fixes #39547.
Built from https://develop.svn.wordpress.org/trunk@48713


git-svn-id: http://core.svn.wordpress.org/trunk@48475 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-08-02 12:57:08 +00:00
parent 0a76cb6240
commit 8ff7595ae9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/options-permalink.php
View File

@ -160,7 +160,7 @@ $using_index_permalinks = $wp_rewrite->using_index_permalinks();
if ( $structure_updated ) {
$message = __( 'Permalink structure updated.' );
if ( $permalink_structure && ! $using_index_permalinks ) {
if ( ! is_multisite() && $permalink_structure && ! $using_index_permalinks ) {
if ( $iis7_permalinks ) {
if ( ! $writable ) {
$message = sprintf(

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.6-alpha-48712';
$wp_version = '5.6-alpha-48713';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.