From 0a76cb62409bc7779352be131b4c7e9a87979b3e Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sun, 2 Aug 2020 12:51:03 +0000
Subject: [PATCH] Permalinks: Simplify the logic for displaying "You should
 update your `.htaccess` file now" message.

See #39547, #50834.
Built from https://develop.svn.wordpress.org/trunk@48712


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

diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index f76abfddc8..88947b9110 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -160,26 +160,28 @@ $using_index_permalinks = $wp_rewrite->using_index_permalinks();
 if ( $structure_updated ) {
 	$message = __( 'Permalink structure updated.' );
 
-	if ( $iis7_permalinks ) {
-		if ( $permalink_structure && ! $using_index_permalinks && ! $writable ) {
+	if ( $permalink_structure && ! $using_index_permalinks ) {
+		if ( $iis7_permalinks ) {
+			if ( ! $writable ) {
+				$message = sprintf(
+					/* translators: %s: web.config */
+					__( 'You should update your %s file now.' ),
+					'<code>web.config</code>'
+				);
+			} else {
+				$message = sprintf(
+					/* translators: %s: web.config */
+					__( 'Permalink structure updated. Remove write access on %s file now!' ),
+					'<code>web.config</code>'
+				);
+			}
+		} elseif ( ! $is_nginx && $htaccess_update_required && ! $writable ) {
 			$message = sprintf(
-				/* translators: %s: web.config */
+				/* translators: %s: .htaccess */
 				__( 'You should update your %s file now.' ),
-				'<code>web.config</code>'
-			);
-		} elseif ( $permalink_structure && ! $using_index_permalinks && $writable ) {
-			$message = sprintf(
-				/* translators: %s: web.config */
-				__( 'Permalink structure updated. Remove write access on %s file now!' ),
-				'<code>web.config</code>'
+				'<code>.htaccess</code>'
 			);
 		}
-	} elseif ( ! $is_nginx && $permalink_structure && ! $using_index_permalinks && ! $writable && $htaccess_update_required ) {
-		$message = sprintf(
-			/* translators: %s: .htaccess */
-			__( 'You should update your %s file now.' ),
-			'<code>.htaccess</code>'
-		);
 	}
 
 	if ( ! get_settings_errors() ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2b89966ed4..4a40c6ce2e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.6-alpha-48711';
+$wp_version = '5.6-alpha-48712';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.