Ticket #16662: 16662.3.diff

wp-includes/taxonomy.php

@@ -15 +15 @@
  * Creates the initial taxonomies when 'init' action is fired.
  */
 function create_initial_taxonomies() {
+        global $wp_rewrite;
+        
         register_taxonomy( 'category', 'post', array(
                 'hierarchical' => true,
                 'update_count_callback' => '_update_post_term_count',
@@ -22 +24 @@
                 'rewrite' => did_action( 'init' ) ? array(
                                         'hierarchical' => true,
                                         'slug' => get_option('category_base') ? get_option('category_base') : 'category',
-                                        'with_front' => false) : false,
+                                        'with_front' => ( get_option('category_base') && ! $wp_rewrite->using_index_permalinks() ) ? false : true ) : false,
                 'public' => true,
                 'show_ui' => true,
                 '_builtin' => true,
@@ -34 +36 @@
                 'query_var' => 'tag',
                 'rewrite' => did_action( 'init' ) ? array(
                                         'slug' => get_option('tag_base') ? get_option('tag_base') : 'tag',
-                                        'with_front' => false) : false,
+                                        'with_front' => ( get_option('category_base') && ! $wp_rewrite->using_index_permalinks() ) ? false : true ) : false,
                 'public' => true,
                 'show_ui' => true,
                 '_builtin' => true,