Changes from branches/3.0/wp-includes/taxonomy.php at r15426 to trunk/wp-includes/taxonomy.php at r17443

File:

• trunk/wp-includes/taxonomy.php (modified) (42 diffs)

trunk/wp-includes/taxonomy.php

@@ -19 +19 @@
         'hierarchical' => true,
         'update_count_callback' => '_update_post_term_count',
-        'query_var' => false,
-        'rewrite' => false,
-        'public' => true,
-        'show_ui' => true,
-        '_builtin' => true,
-    ) ) ;
-
-    register_taxonomy( 'post_tag', 'post', array(
-        'hierarchical' => false,
-        'update_count_callback' => '_update_post_term_count',
-        'query_var' => false,
-        'rewrite' => false,
+        'query_var' => 'category_name',
+        'rewrite' => did_action( 'init' ) ? array(
+                    'hierarchical' => true,
+                    'slug' => get_option('category_base') ? get_option('category_base') : 'category',
+                    'with_front' => false) : false,
         'public' => true,
         'show_ui' => true,
@@ -36 +29 @@
     ) );
 
+    register_taxonomy( 'post_tag', 'post', array(
+        'hierarchical' => false,
+        'update_count_callback' => '_update_post_term_count',
+        'query_var' => 'tag',
+        'rewrite' => did_action( 'init' ) ? array(
+                    'slug' => get_option('tag_base') ? get_option('tag_base') : 'tag',
+                    'with_front' => false) : false,
+        'public' => true,
+        'show_ui' => true,
+        '_builtin' => true,
+    ) );
+
     register_taxonomy( 'nav_menu', 'nav_menu_item', array(
+        'public' => false,
         'hierarchical' => false,
         'labels' => array(
@@ -47 +53 @@
         '_builtin' => true,
         'show_in_nav_menus' => false,
-    ) ) ;
+    ) );
 
     register_taxonomy( 'link_category', 'link', array(
         'hierarchical' => false,
         'labels' => array(
-            'name' => __( 'Categories' ),
-            'singular_name' => __( 'Category' ),
-            'update_item' => __( 'Update Category' ),
+            'name' => __( 'Link Categories' ),
+            'singular_name' => __( 'Link Category' ),
+            'search_items' => __( 'Search Link Categories' ),
+            'popular_items' => null,
+            'all_items' => __( 'All Link Categories' ),
+            'edit_item' => __( 'Edit Link Category' ),
+            'update_item' => __( 'Update Link Category' ),
+            'add_new_item' => __( 'Add New Link Category' ),
+            'new_item_name' => __( 'New Link Category Name' ),
+            'separate_items_with_commas' => null,
+            'add_or_remove_items' => null,
+            'choose_from_most_used' => null,
         ),
         'query_var' => false,
@@ -61 +76 @@
         'show_ui' => false,
         '_builtin' => true,
-    ) ) ;
+    ) );
+
+    $rewrite = false;
+    if ( did_action( 'init' ) ) {
+        $rewrite = apply_filters( 'post_format_rewrite_base', 'type' );
+        $rewrite = $rewrite ? array( 'slug' => $rewrite ) : false;
+    }
+
+    register_taxonomy( 'post_format', 'post', array(
+        'public' => true,
+        'hierarchical' => false,
+        'labels' => array(
+            'name' => _x( 'Format', 'post format' ),
+            'singular_name' => _x( 'Format', 'post format' ),
+        ),
+        'query_var' => true,
+        'rewrite' => $rewrite,
+        'show_ui' => false,
+        '_builtin' => true,
+        'show_in_nav_menus' => false,
+    ) );
 }
 add_action( 'init', 'create_initial_taxonomies', 0 ); // highest priority
@@ -286 +321 @@
             'slug' => sanitize_title_with_dashes($taxonomy),
             'with_front' => true,
+            'hierarchical' => false
         ));
-        $wp_rewrite->add_rewrite_tag("%$taxonomy%", '([^/]+)', $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
-        $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);
+
+        if ( $args['hierarchical'] && $args['rewrite']['hierarchical'] )
+            $tag = '(.+?)';
+        else
+            $tag = '([^/]+)';
+
+        $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']);
     }
 
@@ -319 +361 @@
 
     // register callback handling for metabox
-    add_filter('wp_ajax_add-'.$taxonomy, '_wp_ajax_add_hierarchical_term');
+    add_filter('wp_ajax_add-' . $taxonomy, '_wp_ajax_add_hierarchical_term');
 }
 
@@ -368 +410 @@
         'choose_from_most_used' => array( __( 'Choose from the most used tags' ), null ),
     );
+    $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
 
     return _get_custom_object_labels( $tax, $nohier_vs_hier_defaults );
@@ -461 +504 @@
 
     return $object_ids;
+}
+
+/**
+ * Given a taxonomy query, generates SQL to be appended to a main query.
+ *
+ * @since 3.1.0
+ *
+ * @see WP_Tax_Query
+ *
+ * @param array $tax_query A compact tax query
+ * @param string $primary_table
+ * @param string $primary_id_column
+ * @return array
+ */
+function get_tax_sql( $tax_query, $primary_table, $primary_id_column ) {
+    $tax_query_obj = new WP_Tax_Query( $tax_query );
+    return $tax_query_obj->get_sql( $primary_table, $primary_id_column );
+}
+
+/**
+ * Container class for a multiple taxonomy query.
+ *
+ * @since 3.1.0
+ */
+class WP_Tax_Query {
+
+    /**
+     * List of taxonomy queries. A single taxonomy query is an associative array:
+     * - 'taxonomy' string The taxonomy being queried
+     * - 'terms' string|array The list of terms
+     * - 'field' string (optional) Which term field is being used.
+     *      Possible values: 'term_id', 'slug' or 'name'
+     *      Default: 'term_id'
+     * - 'operator' string (optional)
+     *      Possible values: 'IN' and 'NOT IN'.
+     *      Default: 'IN'
+     * - 'include_children' bool (optional) Whether to include child terms.
+     *      Default: true
+     *
+     * @since 3.1.0
+     * @access public
+     * @var array
+     */
+    var $queries = array();
+
+    /**
+     * The relation between the queries. Can be one of 'AND' or 'OR'.
+     *
+     * @since 3.1.0
+     * @access public
+     * @var string
+     */
+    var $relation;
+
+    /**
+     * PHP4 type constructor.
+     *
+     * Parses a compact tax query and sets defaults.
+     *
+     * @since 3.1.0
+     * @access public
+     *
+     * @param array $tax_query A compact tax query:
+     *  array(
+     *    'relation' => 'OR',
+     *    array(
+     *      'taxonomy' => 'tax1',
+     *      'terms' => array( 'term1', 'term2' ),
+     *      'field' => 'slug',
+     *    ),
+     *    array(
+     *      'taxonomy' => 'tax2',
+     *      'terms' => array( 'term-a', 'term-b' ),
+     *      'field' => 'slug',
+     *    ),
+     *  )
+     *
+     * @return WP_Tax_Query
+     */
+    function WP_Tax_Query( $tax_query ) {
+        if ( isset( $tax_query['relation'] ) && strtoupper( $tax_query['relation'] ) == 'OR' ) {
+            $this->relation = 'OR';
+        } else {
+            $this->relation = 'AND';
+        }
+
+        $defaults = array(
+            'taxonomy' => '',
+            'terms' => array(),
+            'include_children' => true,
+            'field' => 'term_id',
+            'operator' => 'IN',
+        );
+
+        foreach ( $tax_query as $query ) {
+            if ( ! is_array( $query ) )
+                continue;
+
+            $query = array_merge( $defaults, $query );
+
+            $query['terms'] = (array) $query['terms'];
+
+            $this->queries[] = $query;
+        }
+    }
+
+    /**
+     * Generates SQL clauses to be appended to a main query.
+     *
+     * @since 3.1.0
+     * @access public
+     *
+     * @param string $primary_table
+     * @param string $primary_id_column
+     * @return array
+     */
+    function get_sql( $primary_table, $primary_id_column ) {
+        global $wpdb;
+
+        $join = '';
+        $where = array();
+        $i = 0;
+
+        foreach ( $this->queries as $query ) {
+            extract( $query );
+
+            if ( ! taxonomy_exists( $taxonomy ) )
+                return array( 'join' => '', 'where' => ' AND 0 = 1');
+
+            $terms = array_unique( (array) $terms );
+
+            if ( empty( $terms ) )
+                continue;
+
+            if ( is_taxonomy_hierarchical( $taxonomy ) && $include_children ) {
+                $this->_transform_terms( $terms, $taxonomy, $field, 'term_id' );
+
+                $children = array();
+                foreach ( $terms as $term ) {
+                    $children = array_merge( $children, get_term_children( $term, $taxonomy ) );
+                    $children[] = $term;
+                }
+                $terms = $children;
+
+                $this->_transform_terms( $terms, $taxonomy, 'term_id', 'term_taxonomy_id' );
+            }
+            else {
+                $this->_transform_terms( $terms, $taxonomy, $field, 'term_taxonomy_id' );
+            }
+
+            if ( 'IN' == $operator ) {
+
+                if ( empty( $terms ) ) {
+                    if ( 'OR' == $this->relation )
+                        continue;
+                    else
+                        return array( 'join' => '', 'where' => ' AND 0 = 1' );
+                }
+
+                $terms = implode( ',', $terms );
+
+                $alias = $i ? 'tt' . $i : $wpdb->term_relationships;
+
+                $join .= " INNER JOIN $wpdb->term_relationships";
+                $join .= $i ? " AS $alias" : '';
+                $join .= " ON ($primary_table.$primary_id_column = $alias.object_id)";
+
+                $where[] = "$alias.term_taxonomy_id $operator ($terms)";
+            } elseif ( 'NOT IN' == $operator ) {
+
+                if ( empty( $terms ) )
+                    continue;
+
+                $terms = implode( ',', $terms );
+
+                $where[] = "$primary_table.$primary_id_column NOT IN (
+                    SELECT object_id
+                    FROM $wpdb->term_relationships
+                    WHERE term_taxonomy_id IN ($terms)
+                )";
+            } elseif ( 'AND' == $operator ) {
+
+                if ( empty( $terms ) )
+                    continue;
+
+                $num_terms = count( $terms );
+
+                $terms = implode( ',', $terms );
+
+                $where[] = "$primary_table.$primary_id_column IN (
+                    SELECT object_id
+                    FROM $wpdb->term_relationships
+                    WHERE term_taxonomy_id IN ($terms)
+                    GROUP BY object_id HAVING COUNT(object_id) = $num_terms
+                )";
+            }
+
+            $i++;
+        }
+
+        if ( !empty( $where ) )
+            $where = ' AND ( ' . implode( " $this->relation ", $where ) . ' )';
+        else
+            $where = '';
+
+        return compact( 'join', 'where' );
+    }
+
+    /**
+     * Transforms a list of terms, from one field to another.
+     *
+     * @since 3.1.0
+     * @access private
+     *
+     * @param array &$terms The list of terms
+     * @param string $taxonomy The taxonomy of the terms
+     * @param string $field The initial field
+     * @param string $resulting_field The resulting field
+     */
+    function _transform_terms( &$terms, $taxonomy, $field, $resulting_field ) {
+        global $wpdb;
+
+        if ( empty( $terms ) )
+            return;
+
+        if ( $field == $resulting_field )
+            return;
+
+        $resulting_field = esc_sql( $resulting_field );
+
+        switch ( $field ) {
+            case 'slug':
+            case 'name':
+                $terms = "'" . implode( "','", array_map( 'sanitize_title_for_query', $terms ) ) . "'";
+                $terms = $wpdb->get_col( "
+                    SELECT $wpdb->term_taxonomy.$resulting_field
+                    FROM $wpdb->term_taxonomy
+                    INNER JOIN $wpdb->terms USING (term_id)
+                    WHERE taxonomy = '$taxonomy'
+                    AND $wpdb->terms.$field IN ($terms)
+                " );
+                break;
+
+            default:
+                $terms = implode( ',', array_map( 'intval', $terms ) );
+                $terms = $wpdb->get_col( "
+                    SELECT $resulting_field
+                    FROM $wpdb->term_taxonomy
+                    WHERE taxonomy = '$taxonomy'
+                    AND term_id IN ($terms)
+                " );
+        }
+    }
 }
 
@@ -632 +928 @@
  * @uses get_term_children() Used to get the children of both $taxonomy and the parent $term
  *
- * @param string $term ID of Term to get children
+ * @param string $term_id ID of Term to get children
  * @param string $taxonomy Taxonomy Name
  * @return array|WP_Error List of Term Objects. WP_Error returned if $taxonomy does not exist
@@ -807 +1103 @@
  * @uses wp_parse_args() Merges the defaults with those defined by $args and allows for strings.
  *
- * @param string|array Taxonomy name or list of Taxonomy names
+ * @param string|array $taxonomies Taxonomy name or list of Taxonomy names
  * @param string|array $args The values of what to search for when returning terms
  * @return array|WP_Error List of Term Objects and their children. Will return WP_Error, if any of $taxonomies do not exist.
@@ -821 +1117 @@
     }
 
-    foreach ( (array) $taxonomies as $taxonomy ) {
+    foreach ( $taxonomies as $taxonomy ) {
         if ( ! taxonomy_exists($taxonomy) ) {
             $error = & new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
@@ -827 +1123 @@
         }
     }
-
-    $in_taxonomies = "'" . implode("', '", $taxonomies) . "'";
 
     $defaults = array('orderby' => 'name', 'order' => 'ASC',
@@ -851 +1145 @@
         $args['pad_counts'] = false;
     }
+
+    $args = apply_filters( 'get_terms_args', $args, $taxonomies );
+
     extract($args, EXTR_SKIP);
 
@@ -901 +1198 @@
         $order = '';
 
-    $where = '';
+    $where = "tt.taxonomy IN ('" . implode("', '", $taxonomies) . "')";
     $inclusions = '';
     if ( !empty($include) ) {
@@ -923 +1220 @@
         $excluded_trunks = wp_parse_id_list($exclude_tree);
         foreach ( $excluded_trunks as $extrunk ) {
-            $excluded_children = (array) get_terms($taxonomies[0], array('child_of' => intval($extrunk), 'fields' => 'ids'));
+            $excluded_children = (array) get_terms($taxonomies[0], array('child_of' => intval($extrunk), 'fields' => 'ids', 'hide_empty' => 0));
             $excluded_children[] = $extrunk;
             foreach( $excluded_children as $exterm ) {
@@ -955 +1252 @@
 
     if ( !empty($name__like) )
-        $where .= " AND t.name LIKE '{$name__like}%'";
+        $where .= " AND t.name LIKE '" . like_escape( $name__like ) . "%'";
 
     if ( '' !== $parent ) {
@@ -968 +1265 @@
     if ( ! empty($number) && ! $hierarchical && empty( $child_of ) && '' === $parent ) {
         if ( $offset )
-            $limit = 'LIMIT ' . $offset . ',' . $number;
+            $limits = 'LIMIT ' . $offset . ',' . $number;
         else
-            $limit = 'LIMIT ' . $number;
+            $limits = 'LIMIT ' . $number;
     } else {
-        $limit = '';
+        $limits = '';
     }
 
@@ -982 +1279 @@
     $selects = array();
     switch ( $fields ) {
-        case 'all':
-            $selects = array('t.*', 'tt.*');
-            break;
-        case 'ids':
+        case 'all':
+            $selects = array('t.*', 'tt.*');
+            break;
+        case 'ids':
         case 'id=>parent':
-            $selects = array('t.term_id', 'tt.parent', 'tt.count');
-            break;
-        case 'names':
-            $selects = array('t.term_id', 'tt.parent', 'tt.count', 't.name');
-            break;
-        case 'count':
+            $selects = array('t.term_id', 'tt.parent', 'tt.count');
+            break;
+        case 'names':
+            $selects = array('t.term_id', 'tt.parent', 'tt.count', 't.name');
+            break;
+        case 'count':
             $orderby = '';
             $order = '';
-            $selects = array('COUNT(*)');
-    }
-    $select_this = implode(', ', apply_filters( 'get_terms_fields', $selects, $args ));
-
-    $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ($in_taxonomies) $where $orderby $order $limit";
+            $selects = array('COUNT(*)');
+    }
+
+    $_fields = $fields;
+
+    $fields = implode(', ', apply_filters( 'get_terms_fields', $selects, $args ));
+
+    $join = "INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id";
+
+    $pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits' );
+    $clauses = apply_filters( 'terms_clauses', compact( $pieces ), $taxonomies, $args );
+    foreach ( $pieces as $piece )
+        $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
+
+    $query = "SELECT $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";
+
+    $fields = $_fields;
 
     if ( 'count' == $fields ) {
@@ -1012 +1321 @@
 
     if ( empty($terms) ) {
-        wp_cache_add( $cache_key, array(), 'terms' );
+        wp_cache_add( $cache_key, array(), 'terms', 86400 ); // one day
         $terms = apply_filters('get_terms', array(), $taxonomies, $args);
         return $terms;
@@ -1063 +1372 @@
     }
 
-    wp_cache_add( $cache_key, $terms, 'terms' );
+    wp_cache_add( $cache_key, $terms, 'terms', 86400 ); // one day
 
     $terms = apply_filters('get_terms', $terms, $taxonomies, $args);
@@ -1224 +1533 @@
 
     if ( 'edit' == $context ) {
-        $value = apply_filters("edit_term_$field", $value, $term_id, $taxonomy);
-        $value = apply_filters("edit_${taxonomy}_$field", $value, $term_id);
+        $value = apply_filters("edit_term_{$field}", $value, $term_id, $taxonomy);
+        $value = apply_filters("edit_{$taxonomy}_{$field}", $value, $term_id);
         if ( 'description' == $field )
-            $value = format_to_edit($value);
+            $value = esc_html($value); // textarea_escaped
         else
             $value = esc_attr($value);
     } else if ( 'db' == $context ) {
-        $value = apply_filters("pre_term_$field", $value, $taxonomy);
-        $value = apply_filters("pre_${taxonomy}_$field", $value);
+        $value = apply_filters("pre_term_{$field}", $value, $taxonomy);
+        $value = apply_filters("pre_{$taxonomy}_{$field}", $value);
         // Back compat filters
         if ( 'slug' == $field )
@@ -1238 +1547 @@
 
     } else if ( 'rss' == $context ) {
-        $value = apply_filters("term_${field}_rss", $value, $taxonomy);
-        $value = apply_filters("${taxonomy}_${field}_rss", $value);
+        $value = apply_filters("term_{$field}_rss", $value, $taxonomy);
+        $value = apply_filters("{$taxonomy}_{$field}_rss", $value);
     } else {
         // Use display filters by default.
-        $value = apply_filters("term_$field", $value, $term_id, $taxonomy, $context);
-        $value = apply_filters("${taxonomy}_$field", $value, $term_id, $context);
+        $value = apply_filters("term_{$field}", $value, $term_id, $taxonomy, $context);
+        $value = apply_filters("{$taxonomy}_{$field}", $value, $term_id, $context);
     }
 
@@ -1286 +1595 @@
 
 /**
- * Will unlink the term from the taxonomy.
- *
- * Will remove the term's relationship to the taxonomy, not the term or taxonomy
- * itself. The term and taxonomy will still exist. Will require the term's
- * object ID to perform the operation.
+ * Will unlink the object from the taxonomy or taxonomies.
+ *
+ * Will remove all relationships between the object and any terms in
+ * a particular taxonomy or taxonomies. Does not remove the term or
+ * taxonomy itself.
  *
  * @package WordPress
@@ -1298 +1607 @@
  *
  * @param int $object_id The term Object Id that refers to the term
- * @param string|array $taxonomy List of Taxonomy Names or single Taxonomy name.
+ * @param string|array $taxonomies List of Taxonomy Names or single Taxonomy name.
  */
 function wp_delete_object_term_relationships( $object_id, $taxonomies ) {
@@ -1356 +1665 @@
 
     $defaults = array();
+
+    if ( 'category' == $taxonomy ) {
+        $defaults['default'] = get_option( 'default_category' );
+        if ( $defaults['default'] == $term )
+            return 0; // Don't delete the default category
+    }
+
     $args = wp_parse_args($args, $defaults);
     extract($args, EXTR_SKIP);
 
-    if ( isset($default) ) {
+    if ( isset( $default ) ) {
         $default = (int) $default;
         if ( ! term_exists($default, $taxonomy) )
@@ -1393 +1709 @@
     }
 
+    // Clean the relationship caches for all object types using this term
+    $tax_object = get_taxonomy( $taxonomy );
+    foreach ( $tax_object->object_type as $object_type )
+        clean_object_term_cache( $objects, $object_type );
+
     do_action( 'delete_term_taxonomy', $tt_id );
     $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %d", $tt_id ) );
@@ -1407 +1728 @@
 
     return true;
+}
+
+/**
+ * Deletes one existing category.
+ *
+ * @since 2.0.0
+ * @uses wp_delete_term()
+ *
+ * @param int $cat_ID
+ * @return mixed Returns true if completes delete action; false if term doesnt exist;
+ *  Zero on attempted deletion of default Category; WP_Error object is also a possibility.
+ */
+function wp_delete_category( $cat_ID ) {
+    return wp_delete_term( $cat_ID, 'category' );
 }
 
@@ -1436 +1771 @@
  * @uses $wpdb
  *
- * @param int|array $object_id The id of the object(s) to retrieve.
+ * @param int|array $object_ids The ID(s) of the object(s) to retrieve.
  * @param string|array $taxonomies The taxonomies to retrieve terms from.
  * @param array|string $args Change what is returned
@@ -1706 +2041 @@
  *
  * @param int $object_id The object to relate to.
- * @param array|int|string $term The slug or id of the term, will replace all existing
+ * @param array|int|string $terms The slug or id of the term, will replace all existing
  * related terms in this taxonomy.
  * @param array|string $taxonomy The context in which to relate the term to the object.
@@ -1937 +2272 @@
     }
 
+    // Check $parent to see if it will cause a hierarchy loop
+    $parent = apply_filters( 'wp_update_term_parent', $parent, $term_id, $taxonomy, compact( array_keys( $args ) ), $args );
+
     // Check for duplicate slug
     $id = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE slug = %s", $slug ) );
@@ -2472 +2810 @@
  * @since 2.5.0
  *
+ * @uses apply_filters() Calls 'term_link' with term link and term object, and taxonomy parameters.
+ * @uses apply_filters() For the post_tag Taxonomy, Calls 'tag_link' with tag link and tag ID as parameters.
+ * @uses apply_filters() For the category Taxonomy, Calls 'category_link' filter on category link and category ID.
+ *
  * @param object|int|string $term
- * @param string $taxonomy
- * @return string HTML link to taxonomy term archive
- */
-function get_term_link( $term, $taxonomy ) {
+ * @param string $taxonomy (optional if $term is object)
+ * @return string|WP_Error HTML link to taxonomy term archive on success, WP_Error if term does not exist.
+ */
+function get_term_link( $term, $taxonomy = '') {
     global $wp_rewrite;
 
@@ -2493 +2835 @@
         return $term;
 
-    // use legacy functions for core taxonomies until they are fully plugged in
-    if ( $taxonomy == 'category' )
-        return get_category_link((int) $term->term_id);
-    if ( $taxonomy == 'post_tag' )
-        return get_tag_link((int) $term->term_id);
+    $taxonomy = $term->taxonomy;
 
     $termlink = $wp_rewrite->get_extra_permastruct($taxonomy);
 
     $slug = $term->slug;
+    $t = get_taxonomy($taxonomy);
 
     if ( empty($termlink) ) {
-        $t = get_taxonomy($taxonomy);
         if ( $t->query_var )
             $termlink = "?$t->query_var=$slug";
@@ -2511 +2849 @@
         $termlink = home_url($termlink);
     } else {
-        $termlink = str_replace("%$taxonomy%", $slug, $termlink);
+        if ( $t->rewrite['hierarchical'] ) {
+            $hierarchical_slugs = array();
+            $ancestors = get_ancestors($term->term_id, $taxonomy);
+            foreach ( (array)$ancestors as $ancestor ) {
+                $ancestor_term = get_term($ancestor, $taxonomy);
+                $hierarchical_slugs[] = $ancestor_term->slug;
+            }
+            $hierarchical_slugs = array_reverse($hierarchical_slugs);
+            $hierarchical_slugs[] = $slug;
+            $termlink = str_replace("%$taxonomy%", implode('/', $hierarchical_slugs), $termlink);
+        } else {
+            $termlink = str_replace("%$taxonomy%", $slug, $termlink);
+        }
         $termlink = home_url( user_trailingslashit($termlink, 'category') );
     }
+    // Back Compat filters.
+    if ( 'post_tag' == $taxonomy )
+        $termlink = apply_filters( 'tag_link', $termlink, $term->term_id );
+    elseif ( 'category' == $taxonomy )
+        $termlink = apply_filters( 'category_link', $termlink, $term->term_id );
+
     return apply_filters('term_link', $termlink, $term, $taxonomy);
 }
@@ -2529 +2885 @@
  * 'sep' : default is empty string. Separate every taxonomy with value in this.
  * 'after' : default is empty string. Display this after the taxonomies list.
+ * 'template' : The template to use for displaying the taxonomy terms.
  *
  * @since 2.5.0
@@ -2541 +2898 @@
         'sep' => ' ',
         'after' => '',
+        'template' => '%s: %l.'
     );
 
@@ -2546 +2904 @@
     extract( $r, EXTR_SKIP );
 
-    echo $before . join($sep, get_the_taxonomies($post)) . $after;
+    echo $before . join($sep, get_the_taxonomies($post, $r)) . $after;
 }
 
@@ -2558 +2916 @@
  *
  * @param int $post Optional. Post ID or will use Global Post ID (in loop).
+ * @param array $args Override the defaults.
  * @return array
  */
-function get_the_taxonomies($post = 0) {
+function get_the_taxonomies($post = 0, $args = array() ) {
     if ( is_int($post) )
         $post =& get_post($post);
@@ -2566 +2925 @@
         $post =& $GLOBALS['post'];
 
+    $args = wp_parse_args( $args, array(
+        'template' => '%s: %l.',
+    ) );
+    extract( $args, EXTR_SKIP );
+
     $taxonomies = array();
 
     if ( !$post )
         return $taxonomies;
-
-    $template = apply_filters('taxonomy_template', '%s: %l.');
 
     foreach ( get_object_taxonomies($post) as $taxonomy ) {
@@ -2589 +2951 @@
 
         foreach ( $terms as $term )
-            $links[] = "<a href='" . esc_attr(get_term_link($term, $taxonomy)) . "'>$term->name</a>";
+            $links[] = "<a href='" . esc_attr( get_term_link($term) ) . "'>$term->name</a>";
 
         if ( $links )
@@ -2623 +2985 @@
  * @uses wp_get_object_terms()
  *
- * @param int $object_id.  ID of the object (post ID, link ID, ...)
- * @param string $taxonomy.  Single taxonomy name
+ * @param int $object_id ID of the object (post ID, link ID, ...)
+ * @param string $taxonomy Single taxonomy name
  * @param int|string|array $terms Optional.  Term term_id, name, slug or array of said
  * @return bool|WP_Error. WP_Error on input error.
@@ -2669 +3031 @@
  *
  * @param string $object_type Object type string
- * @param string $taxonomy.  Single taxonomy name
+ * @param string $taxonomy Single taxonomy name
  * @return bool True if object is associated with the taxonomy, otherwise false.
  */
@@ -2683 +3045 @@
     return false;
 }
+
+/**
+ * Get an array of ancestor IDs for a given object.
+ *
+ * @param int $object_id The ID of the object
+ * @param string $object_type The type of object for which we'll be retrieving ancestors.
+ * @return array of ancestors from lowest to highest in the hierarchy.
+ */
+function get_ancestors($object_id = 0, $object_type = '') {
+    $object_id = (int) $object_id;
+
+    $ancestors = array();
+
+    if ( empty( $object_id ) ) {
+        return apply_filters('get_ancestors', $ancestors, $object_id, $object_type);
+    }
+
+    if ( is_taxonomy_hierarchical( $object_type ) ) {
+        $term = get_term($object_id, $object_type);
+        while ( ! is_wp_error($term) && ! empty( $term->parent ) && ! in_array( $term->parent, $ancestors ) ) {
+            $ancestors[] = (int) $term->parent;
+            $term = get_term($term->parent, $object_type);
+        }
+    } elseif ( null !== get_post_type_object( $object_type ) ) {
+        $object = get_post($object_id);
+        if ( ! is_wp_error( $object ) && isset( $object->ancestors ) && is_array( $object->ancestors ) )
+            $ancestors = $object->ancestors;
+        else {
+            while ( ! is_wp_error($object) && ! empty( $object->post_parent ) && ! in_array( $object->post_parent, $ancestors ) ) {
+                $ancestors[] = (int) $object->post_parent;
+                $object = get_post($object->post_parent);
+            }
+        }
+    }
+
+    return apply_filters('get_ancestors', $ancestors, $object_id, $object_type);
+}
+
+/**
+ * Returns the term's parent's term_ID
+ *
+ * @since 3.1.0
+ *
+ * @param int $term_id
+ * @param string $taxonomy
+ *
+ * @return int|bool false on error
+ */
+function wp_get_term_taxonomy_parent_id( $term_id, $taxonomy ) {
+    $term = get_term( $term_id, $taxonomy );
+    if ( !$term || is_wp_error( $term ) )
+        return false;
+    return (int) $term->parent;
+}
+
+/**
+ * Checks the given subset of the term hierarchy for hierarchy loops.
+ * Prevents loops from forming and breaks those that it finds.
+ *
+ * Attached to the wp_update_term_parent filter.
+ *
+ * @since 3.1.0
+ * @uses wp_find_hierarchy_loop()
+ *
+ * @param int $parent term_id of the parent for the term we're checking.
+ * @param int $term_id The term we're checking.
+ * @param string $taxonomy The taxonomy of the term we're checking.
+ *
+ * @return int The new parent for the term.
+ */
+function wp_check_term_hierarchy_for_loops( $parent, $term_id, $taxonomy ) {
+    // Nothing fancy here - bail
+    if ( !$parent )
+        return 0;
+
+    // Can't be its own parent
+    if ( $parent == $term_id )
+        return 0;
+
+    // Now look for larger loops
+
+    if ( !$loop = wp_find_hierarchy_loop( 'wp_get_term_taxonomy_parent_id', $term_id, $parent, array( $taxonomy ) ) )
+        return $parent; // No loop
+
+    // Setting $parent to the given value causes a loop
+    if ( isset( $loop[$term_id] ) )
+        return 0;
+
+    // There's a loop, but it doesn't contain $term_id.  Break the loop.
+    foreach ( array_keys( $loop ) as $loop_member )
+        wp_update_term( $loop_member, $taxonomy, array( 'parent' => 0 ) );
+
+    return $parent;
+}