Changeset 6269

Timestamp:

10/17/2007 09:09:54 PM (19 years ago)

Author:

ryan

Message:

Group results when selecting from post2cat and link2cat to avoid dupes. fixes #5223 for trunk

File:

• trunk/wp-admin/includes/upgrade.php (modified) (5 diffs)

trunk/wp-admin/includes/upgrade.php

@@ -534 +534 @@
         // Convert categories to terms.
         $tt_ids = array();
+        $have_tags = false;
         $categories = $wpdb->get_results("SELECT * FROM $wpdb->categories ORDER BY cat_ID");
         foreach ($categories as $category) {
@@ -580 +581 @@
 
                 if ( !empty($category->tag_count) ) {
+                        $have_tags = true;
                         $count = (int) $category->tag_count;
                         $taxonomy = 'post_tag';
@@ -594 +596 @@
         }
 
-        $posts = $wpdb->get_results("SELECT * FROM $wpdb->post2cat");
+        $select = 'post_id, category_id';
+        if ( $have_tags )
+                $select .= ', rel_type';
+
+        $posts = $wpdb->get_results("SELECT $select FROM $wpdb->post2cat GROUP BY post_id, category_id");
         foreach ( $posts as $post ) {
                 $post_id = (int) $post->post_id;
@@ -659 +665 @@
                 update_option('default_link_category', $default_link_cat);
         } else {
-                $links = $wpdb->get_results("SELECT * FROM $wpdb->link2cat");
+                $links = $wpdb->get_results("SELECT link_id, category_id FROM $wpdb->link2cat GROUP BY link_id, category_id");
                 foreach ( $links as $link ) {
                         $link_id = (int) $link->link_id;
@@ -1003 +1009 @@
                                                 // Add the column list to the index create string
                                                 $index_string .= ' ('.$index_columns.')';
-                                                error_log("Index string: $index_string", 0);
                                                 if(!(($aindex = array_search($index_string, $indices)) === false)) {
                                                         unset($indices[$aindex]);