Changeset 14733

Timestamp:

05/19/2010 03:42:55 AM (16 years ago)

Author:

wpmuguru

Message:

don't use both /blog & /index.php on main site permalinks, see #13106

File:

• trunk/wp-admin/options-permalink.php (modified) (1 diff)

trunk/wp-admin/options-permalink.php

@@ -87 +87 @@
         if ( isset( $_POST['permalink_structure'] ) ) {
                 $permalink_structure = $_POST['permalink_structure'];
-                if ( ! empty( $permalink_structure ) )
-                        $permalink_structure = $blog_prefix . preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $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;
+                }
                 $wp_rewrite->set_permalink_structure( $permalink_structure );
         }