diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-16 21:27:04 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-16 21:27:04 +0000 |
commit | 72e9496bfc2f7a962cf4f428ccab25c7a0175aaa (patch) | |
tree | af3e2ca7136c77140d9e9201e3f495a4b8e7a6da /wp-admin/upgrade-functions.php | |
parent | 04b67169db33e30f5ca63dbbafe551fdc6fb2164 (diff) | |
download | wordpress-mu-72e9496bfc2f7a962cf4f428ccab25c7a0175aaa.tar.gz wordpress-mu-72e9496bfc2f7a962cf4f428ccab25c7a0175aaa.tar.xz wordpress-mu-72e9496bfc2f7a962cf4f428ccab25c7a0175aaa.zip |
WP Merge to rev 4753
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@849 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/upgrade-functions.php')
-rw-r--r-- | wp-admin/upgrade-functions.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php index ce4e62c..87249f9 100644 --- a/wp-admin/upgrade-functions.php +++ b/wp-admin/upgrade-functions.php @@ -517,10 +517,12 @@ function upgrade_210() { foreach ( $posts as $post ) 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) ) { $link_cat_id_map[$link_cat->cat_id] = $cat_id; @@ -534,9 +536,13 @@ function upgrade_210() { // Associate links to cats. $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')"); } @@ -553,6 +559,9 @@ function upgrade_210() { $wpdb->query("UPDATE $wpdb->categories SET link_count = '$count' WHERE cat_ID = '$cat_id'"); } } + + // Obsolete linkcategories table + $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'linkcategories'); } } |