Changeset 5530 for trunk/wp-includes/query.php

Timestamp:

05/23/2007 06:59:12 PM (18 years ago)

Author:

ryan

Message:

Convert category queries and list cats to taxonomy. see #4189

File:

• trunk/wp-includes/query.php (modified) (7 diffs)

trunk/wp-includes/query.php

@@ -77 +77 @@
     $cat_obj = $wp_query->get_queried_object();
 
-    if ( $category == $cat_obj->cat_ID )
-        return true;
-    else if ( $category == $cat_obj->cat_name )
-        return true;
-    elseif ( $category == $cat_obj->category_nicename )
+    if ( $category == $cat_obj->term_id )
+        return true;
+    else if ( $category == $cat_obj->name )
+        return true;
+    elseif ( $category == $cat_obj->slug )
         return true;
 
@@ -843 +843 @@
             $q['cat'] = ''.urldecode($q['cat']).'';
             $q['cat'] = addslashes_gpc($q['cat']);
-            $join = " LEFT JOIN $wpdb->post2cat ON ($wpdb->posts.ID = $wpdb->post2cat.post_id) ";
+            $join = " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) ";
             $cat_array = preg_split('/[,\s]+/', $q['cat']);
             $in_cats = $out_cats = $out_posts = '';
@@ -858 +858 @@
             $out_cats = substr($out_cats, 0, -2);
             if ( strlen($in_cats) > 0 )
-                $in_cats = " AND $wpdb->post2cat.category_id IN ($in_cats) AND rel_type = 'category' ";
+                $in_cats = " AND $wpdb->term_taxonomy.term_id IN ({$q['cat']}) ";
             if ( strlen($out_cats) > 0 ) {
+                // TODO
                 $ids = $wpdb->get_col("SELECT post_id FROM $wpdb->post2cat WHERE $wpdb->post2cat.category_id IN ($out_cats)");
                 if ( is_array($ids) && count($ids > 0) ) {
@@ -871 +872 @@
                     $out_cats = '';
             }
-            $whichcat = $in_cats . $out_cats;
+            $whichcat = " AND $wpdb->term_taxonomy.taxonomy = 'category' ";
+            $whichcat .= $in_cats . $out_cats;
             $groupby = "{$wpdb->posts}.ID";
         }
@@ -883 +885 @@
 
             $q['tag_id'] = $reqtag;
-            // TODO: use term taxonomy
-            $tables = ", $wpdb->post2cat, $wpdb->categories";
             $join = " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) ";
             $whichcat = " AND $wpdb->term_taxonomy.term_id IN ({$q['tag_id']}) AND $wpdb->term_taxonomy.taxonomy = 'post_tag' ";
@@ -909 +909 @@
 
             if ( !empty($reqcat) )
-                $reqcat = $reqcat->cat_ID;
+                $reqcat = $reqcat->term_id;
             else
                 $reqcat = 0;
@@ -915 +915 @@
             $q['cat'] = $reqcat;
 
-            $tables = ", $wpdb->post2cat, $wpdb->categories";
-            $join = " LEFT JOIN $wpdb->post2cat ON ($wpdb->posts.ID = $wpdb->post2cat.post_id) LEFT JOIN $wpdb->categories ON ($wpdb->post2cat.category_id = $wpdb->categories.cat_ID) ";
-            $whichcat = " AND category_id IN ({$q['cat']}, ";
+            $join = " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) ";
+            $whichcat = " AND $wpdb->term_taxonomy.taxonomy = 'category' ";
+            $whichcat .= "AND $wpdb->term_taxonomy.term_id IN ({$q['cat']}, ";
             $whichcat .= get_category_children($q['cat'], '', ', ');
             $whichcat = substr($whichcat, 0, -2);
-            $whichcat .= ") AND rel_type = 'category'";
+            $whichcat .= ")";
             $groupby = "{$wpdb->posts}.ID";
         }