Changeset 5643

Timestamp:

06/03/2007 06:57:14 PM (19 years ago)

Author:

ryan

Message:

Upgrade fixes. see #4189

File:

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

trunk/wp-admin/includes/upgrade.php

@@ -608 +608 @@
                 $wpdb->query("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES ('$term_id', '$name', '$slug', '$term_group')");
 
+                $count = 0;
                 if ( !empty($category->category_count) ) {
                         $count = (int) $category->category_count;
@@ -613 +614 @@
                         $wpdb->query("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ('$term_id', '$taxonomy', '$description', '$parent', '$count')");
                         $tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
-                } else if ( !empty($category->link_count) ) {
+                }
+
+                if ( !empty($category->link_count) ) {
                         $count = (int) $category->link_count;
                         $taxonomy = 'link_category';
                         $wpdb->query("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ('$term_id', '$taxonomy', '$description', '$parent', '$count')");
                         $tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
-                } else if ( !empty($category->tag_count) ) {
+                }
+
+                if ( !empty($category->tag_count) ) {
                         $count = (int) $category->tag_count;
                         $taxonomy = 'post_tag';
                         $wpdb->query("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ('$term_id', '$taxonomy', '$description', '$parent', '$count')");
                         $tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
-                } else {
+                }
+                
+                if ( empty($count) ) {
                         $count = 0;
                         $taxonomy = 'category';