Changeset 4738

Timestamp:

01/16/2007 01:54:50 AM (18 years ago)

Author:

ryan

Message:

Cleanup link upgrade code. Drop linkcategories table.

Location:

trunk

Files:

• wp-admin/upgrade-functions.php (modified) (3 diffs)
• wp-includes/wp-db.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/wp-admin/upgrade-functions.php

@@ -509 +509 @@
                 wp_schedule_single_event(mysql2date('U', $post->post_date), 'publish_future_post', array($post->ID));
     }
+
     if ( $wp_current_db_version < 3570 ) {
         // Create categories for link categories if a category with the same
         // name doesn't exist.  Create a map of link cat IDs to cat IDs.
-        $link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM $wpdb->linkcategories");
+        $link_cat_id_map = array();
+        $link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM " . $wpdb->prefix . 'linkcategories');
         foreach ( $link_cats as $link_cat) {
             if ( $cat_id = category_exists($link_cat->cat_name) ) {
@@ -526 +528 @@
         $links = $wpdb->get_results("SELECT link_id, link_category FROM $wpdb->links");
         if ( !empty($links) ) foreach ( $links as $link ) {
+            if ( 0 == $link->link_category )
+                continue;
+            if ( ! isset($link_cat_id_map[$link->link_category]) )
+                continue;
             $link_cat = $link_cat_id_map[$link->link_category];
             $cat = $wpdb->get_row("SELECT * FROM $wpdb->link2cat WHERE link_id = '$link->link_id' AND category_id = '$link_cat'");
-            if (!$cat && 0 != $link->link_category) {
+            if ( !$cat ) {
                 $wpdb->query("INSERT INTO $wpdb->link2cat (link_id, category_id)
                     VALUES ('$link->link_id', '$link_cat')");
@@ -545 +551 @@
             }
         }
+
+        // Obsolete linkcategories table
+        $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'linkcategories');
     }
 }

trunk/wp-includes/wp-db.php

@@ -29 +29 @@
     var $comments;
     var $links;
-    var $linkcategories;
     var $options;
     var $optiontypes;

trunk/wp-settings.php

@@ -114 +114 @@
 $wpdb->link2cat       = $wpdb->prefix . 'link2cat';
 $wpdb->links          = $wpdb->prefix . 'links';
-$wpdb->linkcategories = $wpdb->prefix . 'linkcategories';
 $wpdb->options        = $wpdb->prefix . 'options';
 $wpdb->postmeta       = $wpdb->prefix . 'postmeta';