Changeset 27549

Timestamp:

03/15/2014 04:34:23 AM (11 years ago)

Author:

nacin

Message:

Permalink Settings: Don't show "update your .htaccess now" if nothing needs to change.

props ldebrouwer, MikeHansenMe.
fixes #19268.

File:

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

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

@@ -118 +118 @@
 }
 
-$permalink_structure = get_option('permalink_structure');
-$category_base = get_option('category_base');
-$tag_base = get_option( 'tag_base' );
+$permalink_structure = get_option( 'permalink_structure' );
+$category_base       = get_option( 'category_base' );
+$tag_base            = get_option( 'tag_base' );
+$update_required     = false;
 
 if ( $iis7_permalinks ) {
@@ -130 +131 @@
     $writable = false;
 } else {
-    if ( ( ! file_exists($home_path . '.htaccess') && is_writable($home_path) ) || is_writable($home_path . '.htaccess') )
+    if ( ( ! file_exists( $home_path . '.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path . '.htaccess' ) ) {
         $writable = true;
-    else
+    } 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 );
+    }
 }
 
@@ -158 +163 @@
         _e('Permalink structure updated.');
     } else {
-        if ( $permalink_structure && ! $usingpi && ! $writable )
+        if ( $permalink_structure && ! $usingpi && ! $writable && $update_required ) {
             _e('You should update your .htaccess now.');
-        else
+        } else {
             _e('Permalink structure updated.');
+        }
     }
 } else {
@@ -274 +280 @@
     <?php endif; ?>
 <?php elseif ( ! $is_nginx ) :
-    if ( $permalink_structure && ! $usingpi && ! $writable ) : ?>
+    if ( $permalink_structure && ! $usingpi && ! $writable && $update_required ) : ?>
 <p><?php _e('If your <code>.htaccess</code> file were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
 <form action="options-permalink.php" method="post">