Changeset 38066

Timestamp:

07/16/2016 12:43:16 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Permalinks: After [37747], make sure $usingpi, $writable, and $update_required are defined before checking them on permalinks update.

Props Clorith.
Fixes #37380.

File:

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

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

@@ -65 +65 @@
 if ( is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos( $permalink_structure, '/blog/' ) ) {
     $blog_prefix = '/blog';
-}
-
-if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
-    check_admin_referer('update-permalink');
-
-    if ( isset( $_POST['permalink_structure'] ) ) {
-        if ( isset( $_POST['selection'] ) && 'custom' != $_POST['selection'] )
-            $permalink_structure = $_POST['selection'];
-        else
-            $permalink_structure = $_POST['permalink_structure'];
-
-        if ( ! empty( $permalink_structure ) ) {
-            $permalink_structure = preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );
-            if ( $prefix && $blog_prefix )
-                $permalink_structure = $prefix . preg_replace( '#^/?index\.php#', '', $permalink_structure );
-            else
-                $permalink_structure = $blog_prefix . $permalink_structure;
-        }
-
-        $permalink_structure = sanitize_option( 'permalink_structure', $permalink_structure );
-
-        $wp_rewrite->set_permalink_structure( $permalink_structure );
-    }
-
-    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 );
-    }
-
-    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 );
-    }
-
-    $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' ) );
-    exit;
 }
 
@@ -149 +91 @@
 $usingpi = $wp_rewrite->using_index_permalinks();
 
+if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
+    check_admin_referer('update-permalink');
+
+    if ( isset( $_POST['permalink_structure'] ) ) {
+        if ( isset( $_POST['selection'] ) && 'custom' != $_POST['selection'] )
+            $permalink_structure = $_POST['selection'];
+        else
+            $permalink_structure = $_POST['permalink_structure'];
+
+        if ( ! empty( $permalink_structure ) ) {
+            $permalink_structure = preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );
+            if ( $prefix && $blog_prefix )
+                $permalink_structure = $prefix . preg_replace( '#^/?index\.php#', '', $permalink_structure );
+            else
+                $permalink_structure = $blog_prefix . $permalink_structure;
+        }
+
+        $permalink_structure = sanitize_option( 'permalink_structure', $permalink_structure );
+
+        $wp_rewrite->set_permalink_structure( $permalink_structure );
+    }
+
+    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 );
+    }
+
+    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 );
+    }
+
+    $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' ) );
+    exit;
+}
+
 flush_rewrite_rules();