Changeset 10021

Timestamp:

12/03/2008 05:47:44 PM (16 years ago)

Author:

ryan

Message:

Don't import cat and tags with empty string for name. Check for WP_Error after term insertion. fixes #8474

File:

• trunk/wp-admin/import/wordpress.php (modified) (4 diffs)

trunk/wp-admin/import/wordpress.php

@@ -462 +462 @@
                 $post_cats = array();
                 foreach ($categories as $category) {
+                    if ( '' == $category )
+                        continue;
                     $slug = sanitize_term_field('slug', $category, 0, 'category', 'db');
                     $cat = get_term_by('slug', $slug, 'category');
@@ -470 +472 @@
                         $category = $wpdb->escape($category);
                         $cat_ID = wp_insert_category(array('cat_name' => $category));
+                        if ( is_wp_error($cat_ID) )
+                            continue;
                     }
                     $post_cats[] = $cat_ID;
@@ -480 +484 @@
                 $post_tags = array();
                 foreach ($tags as $tag) {
+                    if ( '' == $tag )
+                        continue;
                     $slug = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
                     $tag_obj = get_term_by('slug', $slug, 'post_tag');
@@ -488 +494 @@
                         $tag = $wpdb->escape($tag);
                         $tag_id = wp_insert_term($tag, 'post_tag');
+                        if ( is_wp_error($tag_id) )
+                            continue;
                         $tag_id = $tag_id['term_id'];
                     }