Changeset 17513

Timestamp:

03/09/2011 05:19:20 AM (14 years ago)

Author:

markjaquith

Message:

Prevent double index.php preprend on PATHINFO custom taxonomy permalinks. Proper use of with_front. props greuben. fixes #16918. fixes #16622. see #15813. see #12659. For 3.1

Location:

branches/3.1/wp-includes

Files:

• taxonomy.php (modified) (4 diffs)
• version.php (modified) (1 diff)

branches/3.1/wp-includes/taxonomy.php

@@ -16 +16 @@
  */
 function create_initial_taxonomies() {
+    global $wp_rewrite;
+
     register_taxonomy( 'category', 'post', array(
         'hierarchical' => true,
@@ -23 +25 @@
                     '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,
@@ -35 +37 @@
         '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,
@@ -330 +332 @@
 
         $wp_rewrite->add_rewrite_tag("%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
-        $wp_rewrite->add_permastruct($taxonomy, "{$wp_rewrite->root}{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);
+        $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);
     }
 

branches/3.1/wp-includes/version.php

@@ -30 +30 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 17056;
+$wp_db_version = 17510;
 
 /**