Changeset 5592 for trunk/wp-includes/post.php

Timestamp:

05/29/2007 04:52:31 PM (18 years ago)

Author:

ryan

Message:

Use taxonomy instead of post2cat. see #4189

File:

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

trunk/wp-includes/post.php

@@ -231 +231 @@
 
     $query  = "SELECT DISTINCT * FROM $wpdb->posts ";
-    $query .= empty( $category ) ? '' : ", $wpdb->post2cat "; 
+    $query .= empty( $category ) ? '' : ", $wpdb->term_relationships, $wpdb->term_taxonomy  "; 
     $query .= empty( $meta_key ) ? '' : ", $wpdb->postmeta ";
     $query .= " WHERE 1=1 ";
@@ -237 +237 @@
     $query .= empty( $post_status ) ? '' : "AND post_status = '$post_status' ";
     $query .= "$exclusions $inclusions " ;
-    $query .= empty( $category ) ? '' : "AND ($wpdb->posts.ID = $wpdb->post2cat.post_id AND $wpdb->post2cat.category_id = " . $category. ") ";
+    $query .= empty( $category ) ? '' : "AND ($wpdb->posts.ID = $wpdb->term_relationships.object_id AND $wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id AND $wpdb->term_taxonomy.term_id = " . $category. ") ";
     $query .= empty( $post_parent ) ? '' : "AND $wpdb->posts.post_parent = '$post_parent' ";
     $query .= empty( $meta_key ) | empty($meta_value)  ? '' : " AND ($wpdb->posts.ID = $wpdb->postmeta.post_id AND $wpdb->postmeta.meta_key = '$meta_key' AND $wpdb->postmeta.meta_value = '$meta_value' )";
@@ -1696 +1696 @@
 
 function update_post_category_cache($post_ids) {
-    global $wpdb, $category_cache, $tag_cache, $blog_id;
+    global $wpdb, $term_cache, $blog_id;
     // TODO
     return;
@@ -1709 +1709 @@
     for ( $i = 0; $i < $count; $i++ ) {
         $post_id = (int) $post_id_array[ $i ];
-        if ( isset( $category_cache[$blog_id][$post_id] ) ) {
+        if ( isset( $term_cache[$blog_id][$post_id] ) ) {
             unset( $post_id_array[ $i ] );
             continue;
@@ -1716 +1716 @@
     if ( count( $post_id_array ) == 0 )
         return;
-    $post_id_list = join( ',', $post_id_array ); // with already cached stuff removed
-
-    $dogs = $wpdb->get_results("SELECT post_id, category_id, rel_type FROM $wpdb->post2cat WHERE post_id IN ($post_id_list)");
+
+    $dogs = get_object_terms($post_id_array, array('category', 'post_tag'));
 
     if ( empty($dogs) )
@@ -1724 +1723 @@
 
     foreach ($dogs as $catt) {
-        if ( 'category' == $catt->rel_type )
-            $category_cache[$blog_id][$catt->post_id][$catt->category_id] = &get_category($catt->category_id);
-        elseif ( 'tag' == $catt->rel_type )
-            $tag_cache[$blog_id][$catt->post_id][$catt->category_id] = &get_category($catt->category_id);
+        $term_cache[$blog_id][$catt->post_id][$catt->taxonomy][$catt->category_id] = &get_category($catt->category_id);
     }
 }
 
 function update_post_caches(&$posts) {
-    global $post_cache, $category_cache, $post_meta_cache, $tag_cache;
+    global $post_cache;
     global $wpdb, $blog_id;