Changeset 5567

Timestamp:

05/28/2007 12:51:24 AM (16 years ago)

Author:

ryan

Message:

Register taxonomies as object instead of arrays. Fix tt_ids query in get_post_terms().

File:

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

trunk/wp-includes/taxonomy.php

@@ -1 +1 @@
 <?php
 
-$wp_taxonomies =
-array('category' => array('object_type' => 'post', 'hierarchical' => true, 'update_count_callback' => '_update_post_term_count'),
-'post_tag' => array('object_type' => 'post', 'hierarchical' => false, 'update_count_callback' => '_update_post_term_count'),
-'link_category' => array('object_type' => 'link', 'hierarchical' => false));
-
+$wp_taxonomies = array();
+$wp_taxonomies['category'] = (object) array('name' => 'category', 'object_type' => 'post', 'hierarchical' => true, 'update_count_callback' => '_update_post_term_count');
+$wp_taxonomies['post_tag'] = (object) array('name' => 'post_tag', 'object_type' => 'post', 'hierarchical' => false, 'update_count_callback' => '_update_post_term_count');
+$wp_taxonomies['link_category'] = (object) array('name' => 'link_category', 'object_type' => 'link', 'hierarchical' => false);
+
+//error_log(var_export($wp_taxonomies, true), 0);
 function is_taxonomy( $taxonomy ) {
     global $wp_taxonomies;
@@ -26 +27 @@
 
     $taxonomy = get_taxonomy($taxonomy);
-    return $taxonomy['hierarchical'];
+    return $taxonomy->hierarchical;
 }
 
@@ -32 +33 @@
     global $wp_taxonomies;
 
+    $defaults = array('hierarchical' => false, 'update_count_callback' => '');
+    $args = wp_parse_args($args, $defaults);
+
+    $args['name'] = $taxonomy;
     $args['object_type'] = $object_type;
-    $wp_taxonomies[$taxonomy] = $args;
+    $wp_taxonomies[$taxonomy] = (object) $args;
 }
 
@@ -260 +265 @@
 
     $taxonomy = get_taxonomy($taxonomy);
-    if ( isset($taxonomy['update_count_callback']) )
-        return call_user_func($taxonomy['update_count_callback'], $terms);
+    if ( isset($taxonomy->update_count_callback) )
+        return call_user_func($taxonomy->update_count_callback, $terms);
 
     // Default count updater
@@ -338 +343 @@
         $id = $id['term_taxonomy_id'];
         $tt_ids[] = $id;
+
         if ( $wpdb->get_var("SELECT term_taxonomy_id FROM $wpdb->term_relationships WHERE object_id = '$object_id' AND term_taxonomy_id = '$id'") )
             continue;
@@ -401 +407 @@
         $taxonomy_data = $wpdb->get_col($query);
     else if ( 'tt_ids' == $fields )
-        $taxonomy_data = $wpdb->get_col("SELECT term_taxonomy_id FROM $wpdb->term_relationships WHERE object_id IN ($object_ids) ORDER BY term_taxonomy_id $order");
+        $taxonomy_data = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id IN ($object_ids) AND tt.taxonomy IN ($taxonomies) ORDER BY tr.term_taxonomy_id $order");
 
     if ( ! $taxonomy_data )