Changeset 48710

Timestamp:

08/02/2020 12:34:05 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Permalinks: Correct the check whether .htaccess update is required when saving permalink settings.

The check should be performed after the permalink structure update, not before.

Fixes #50834.

File:

• trunk/src/wp-admin/options-permalink.php (modified) (7 diffs)

trunk/src/wp-admin/options-permalink.php

@@ -73 +73 @@
 }
 
-/*
+/**
  * In a subdirectory configuration of multisite, the `/blog` prefix is used by
  * default on the main site to avoid collisions with other sites created on that
@@ -83 +83 @@
 }
 
-$category_base   = get_option( 'category_base' );
-$tag_base        = get_option( 'tag_base' );
-$update_required = false;
-
-if ( $iis7_permalinks ) {
-    if ( ( ! file_exists( $home_path . 'web.config' ) && win_is_writable( $home_path ) ) || win_is_writable( $home_path . 'web.config' ) ) {
-        $writable = true;
-    } else {
-        $writable = false;
-    }
-} elseif ( $is_nginx ) {
-    $writable = false;
-} else {
-    if ( ( ! file_exists( $home_path . '.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path . '.htaccess' ) ) {
-        $writable = true;
-    } else {
-        $writable        = false;
-        $existing_rules  = array_filter( extract_from_markers( $home_path . '.htaccess', 'WordPress' ) );
-        $new_rules       = array_filter( explode( "\n", $wp_rewrite->mod_rewrite_rules() ) );
-        $update_required = ( $new_rules !== $existing_rules );
-    }
-}
-
-$using_index_permalinks = $wp_rewrite->using_index_permalinks();
+$category_base = get_option( 'category_base' );
+$tag_base      = get_option( 'tag_base' );
+
+$structure_updated        = false;
+$htaccess_update_required = false;
 
 if ( isset( $_POST['permalink_structure'] ) || isset( $_POST['category_base'] ) ) {
@@ -112 +93 @@
 
     if ( isset( $_POST['permalink_structure'] ) ) {
-        if ( isset( $_POST['selection'] ) && 'custom' != $_POST['selection'] ) {
+        if ( isset( $_POST['selection'] ) && 'custom' !== $_POST['selection'] ) {
             $permalink_structure = $_POST['selection'];
         } else {
@@ -130 +111 @@
 
         $wp_rewrite->set_permalink_structure( $permalink_structure );
+
+        $structure_updated = true;
     }
 
     if ( isset( $_POST['category_base'] ) ) {
         $category_base = $_POST['category_base'];
+
         if ( ! empty( $category_base ) ) {
             $category_base = $blog_prefix . preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
         }
+
         $wp_rewrite->set_category_base( $category_base );
     }
@@ -142 +127 @@
     if ( isset( $_POST['tag_base'] ) ) {
         $tag_base = $_POST['tag_base'];
+
         if ( ! empty( $tag_base ) ) {
             $tag_base = $blog_prefix . preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
         }
+
         $wp_rewrite->set_tag_base( $tag_base );
     }
-
+}
+
+if ( $iis7_permalinks ) {
+    if ( ( ! file_exists( $home_path . 'web.config' ) && win_is_writable( $home_path ) ) || win_is_writable( $home_path . 'web.config' ) ) {
+        $writable = true;
+    } else {
+        $writable = false;
+    }
+} elseif ( $is_nginx ) {
+    $writable = false;
+} else {
+    if ( ( ! file_exists( $home_path . '.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path . '.htaccess' ) ) {
+        $writable = true;
+    } else {
+        $writable       = false;
+        $existing_rules = array_filter( extract_from_markers( $home_path . '.htaccess', 'WordPress' ) );
+        $new_rules      = array_filter( explode( "\n", $wp_rewrite->mod_rewrite_rules() ) );
+
+        $htaccess_update_required = ( $new_rules !== $existing_rules );
+    }
+}
+
+$using_index_permalinks = $wp_rewrite->using_index_permalinks();
+
+if ( $structure_updated ) {
     $message = __( 'Permalink structure updated.' );
 
@@ -164 +175 @@
             );
         }
-    } elseif ( ! $is_nginx && $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required ) {
+    } elseif ( ! $is_nginx && $permalink_structure && ! $using_index_permalinks && ! $writable && $htaccess_update_required ) {
         $message = sprintf(
             /* translators: %s: .htaccess */
@@ -401 +412 @@
     <?php
 else :
-    if ( $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required ) :
+    if ( $permalink_structure && ! $using_index_permalinks && ! $writable && $htaccess_update_required ) :
         ?>
 <p>