Changeset 6051

Timestamp:

09/06/2007 10:56:03 PM (18 years ago)

Author:

ryan

Message:

Fix term count calculation during upgrade. fixes #4922

File:

• trunk/wp-admin/includes/upgrade.php (modified) (1 diff)

trunk/wp-admin/includes/upgrade.php

@@ -674 +674 @@
 
     // Recalculate all counts
-    $terms = $wpdb->get_col("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy");
+    $terms = $wpdb->get_results("SELECT term_taxonomy_id, taxonomy FROM $wpdb->term_taxonomy");
     foreach ( (array) $terms as $term ) {
-        $count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = '$term'");
-        $wpdb->query("UPDATE $wpdb->term_taxonomy SET count = '$count' WHERE term_taxonomy_id = '$term'");
+        if ( ('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy) )
+            $count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = '$term->term_taxonomy_id'");
+        else
+            $count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = '$term->term_taxonomy_id'");
+        $wpdb->query("UPDATE $wpdb->term_taxonomy SET count = '$count' WHERE term_taxonomy_id = '$term->term_taxonomy_id'");
     }
 }