Changeset 37747 for trunk/src/wp-admin/options-permalink.php

Timestamp:

06/19/2016 12:01:11 PM (10 years ago)

Author:

swissspidy

Message:

Permalinks: Validate custom permalink structures.

Custom permalink structures require at least one valid structure tag, e.g. %postname%. If none is included, it would leave users with broken permalinks.
Let's make sure this won't happen by validating the permalink structure.

Adds unit tests.

Props rockwell15 for initial patch.
Fixes #35936.

File:

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

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

@@ -83 +83 @@
                                 $permalink_structure = $blog_prefix . $permalink_structure;
                 }
+
+                $permalink_structure = sanitize_option( 'permalink_structure', $permalink_structure );
+
                 $wp_rewrite->set_permalink_structure( $permalink_structure );
         }
@@ -99 +102 @@
                 $wp_rewrite->set_tag_base( $tag_base );
         }
+
+        $message = __( 'Permalink structure updated.' );
+
+        if ( $iis7_permalinks ) {
+                if ( $permalink_structure && ! $usingpi && ! $writable ) {
+                        $message = __( 'You should update your web.config now.' );
+                } elseif ( $permalink_structure && ! $usingpi && $writable ) {
+                        $message = __( 'Permalink structure updated. Remove write access on web.config file now!' );
+                }
+        } elseif ( ! $is_nginx && $permalink_structure && ! $usingpi && ! $writable && $update_required ) {
+                $message = __( 'You should update your .htaccess now.' );
+        }
+
+        if ( ! get_settings_errors() ) {
+                add_settings_error( 'general', 'settings_updated', $message, 'updated' );
+        }
+
+        set_transient( 'settings_errors', get_settings_errors(), 30 );
 
         wp_redirect( admin_url( 'options-permalink.php?settings-updated=true' ) );
@@ -126 +147 @@
 }
 
-if ( $wp_rewrite->using_index_permalinks() )
-        $usingpi = true;
-else
-        $usingpi = false;
+$usingpi = $wp_rewrite->using_index_permalinks();
 
 flush_rewrite_rules();
 
 require( ABSPATH . 'wp-admin/admin-header.php' );
-
-if ( ! empty( $_GET['settings-updated'] ) ) : ?>
-<div id="message" class="updated notice is-dismissible"><p><?php
-if ( ! is_multisite() ) {
-        if ( $iis7_permalinks ) {
-                if ( $permalink_structure && ! $usingpi && ! $writable ) {
-                        _e('You should update your web.config now.');
-                } elseif ( $permalink_structure && ! $usingpi && $writable ) {
-                        _e('Permalink structure updated. Remove write access on web.config file now!');
-                } else {
-                        _e('Permalink structure updated.');
-                }
-        } elseif ( $is_nginx ) {
-                _e('Permalink structure updated.');
-        } else {
-                if ( $permalink_structure && ! $usingpi && ! $writable && $update_required ) {
-                        _e('You should update your .htaccess now.');
-                } else {
-                        _e('Permalink structure updated.');
-                }
-        }
-} else {
-        _e('Permalink structure updated.');
-}
 ?>
-</p></div>
-<?php endif; ?>
-
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>