Changes from trunk/wp-includes/taxonomy.php at r17443 to branches/3.1/wp-includes/taxonomy.php at r17527

File:

• branches/3.1/wp-includes/taxonomy.php (modified) (6 diffs)

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']);
     }
 
@@ -888 +890 @@
         $field = 't.name';
     } else {
-        return get_term( (int) $value, $taxonomy, $output, $filter);
+        $term = get_term( (int) $value, $taxonomy, $output, $filter);
+        if ( is_wp_error( $term ) )
+            $term = false;
+        return $term;
     }
 
@@ -2843 +2848 @@
 
     if ( empty($termlink) ) {
-        if ( $t->query_var )
+        if ( 'category' == $taxonomy )
+            $termlink = '?cat=' . $term->term_id;
+        elseif ( $t->query_var )
             $termlink = "?$t->query_var=$slug";
         else