Changes in branches/3.1/wp-includes/taxonomy.php [17527:17444]

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,
@@ -25 +23 @@
                     'hierarchical' => true,
                     'slug' => get_option('category_base') ? get_option('category_base') : 'category',
-                    'with_front' => ( get_option('category_base') && ! $wp_rewrite->using_index_permalinks() ) ? false : true ) : false,
+                    'with_front' => false) : false,
         'public' => true,
         'show_ui' => true,
@@ -37 +35 @@
         'rewrite' => did_action( 'init' ) ? array(
                     'slug' => get_option('tag_base') ? get_option('tag_base') : 'tag',
-                    'with_front' => ( get_option('category_base') && ! $wp_rewrite->using_index_permalinks() ) ? false : true ) : false,
+                    'with_front' => false) : false,
         'public' => true,
         'show_ui' => true,
@@ -332 +330 @@
 
         $wp_rewrite->add_rewrite_tag("%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
-        $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);
+        $wp_rewrite->add_permastruct($taxonomy, "{$wp_rewrite->root}{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);
     }
 
@@ -890 +888 @@
         $field = 't.name';
     } else {
-        $term = get_term( (int) $value, $taxonomy, $output, $filter);
-        if ( is_wp_error( $term ) )
-            $term = false;
-        return $term;
+        return get_term( (int) $value, $taxonomy, $output, $filter);
     }
 
@@ -2848 +2843 @@
 
     if ( empty($termlink) ) {
-        if ( 'category' == $taxonomy )
-            $termlink = '?cat=' . $term->term_id;
-        elseif ( $t->query_var )
+        if ( $t->query_var )
             $termlink = "?$t->query_var=$slug";
         else