Changeset 14732

Timestamp:

05/19/2010 03:15:59 AM (16 years ago)

Author:

wpmuguru

Message:

restore single WP permalink settings per 2.9.X, related #13106, see #13303

File:

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

trunk/wp-admin/options-permalink.php

@@ -88 +88 @@
                 $permalink_structure = $_POST['permalink_structure'];
                 if ( ! empty( $permalink_structure ) )
-                        $permalink_structure = $prefix . preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );
+                        $permalink_structure = $blog_prefix . preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );
                 $wp_rewrite->set_permalink_structure( $permalink_structure );
         }
@@ -95 +95 @@
                 $category_base = $_POST['category_base'];
                 if ( ! empty( $category_base ) )
-                        $category_base = $prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
+                        $category_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
                 $wp_rewrite->set_category_base( $category_base );
         }
@@ -102 +102 @@
                 $tag_base = $_POST['tag_base'];
                 if ( ! empty( $tag_base ) )
-                        $tag_base = $prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
+                        $tag_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
                 $wp_rewrite->set_tag_base( $tag_base );
         }
@@ -164 +164 @@
 
 <?php
-if ( ! got_mod_rewrite() && ! $iis7_permalinks )
-        $permalink_structure = preg_replace( '|^/?index\.php|', '', $permalink_structure );
-
 if ( is_multisite() && !is_subdomain_install() && is_main_site() ) {
         $permalink_structure = preg_replace( '|^/?blog|', '', $permalink_structure );