From 8ddfe0f10169543fa3df8c04c2b7f966ba3ea676 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 3 Dec 2008 17:47:44 +0000
Subject: [PATCH] Don't import cat and tags with empty string for name.  Check
 for WP_Error after term insertion. fixes #8474

git-svn-id: http://svn.automattic.com/wordpress/trunk@10021 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/import/wordpress.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/wp-admin/import/wordpress.php b/wp-admin/import/wordpress.php
index a6f5db4bd1..892fe59c5c 100644
--- a/wp-admin/import/wordpress.php
+++ b/wp-admin/import/wordpress.php
@@ -461,6 +461,8 @@ class WP_Import {
 			if (count($categories) > 0) {
 				$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');
 					$cat_ID = 0;
@@ -469,6 +471,8 @@ class WP_Import {
 					if ($cat_ID == 0) {
 						$category = $wpdb->escape($category);
 						$cat_ID = wp_insert_category(array('cat_name' => $category));
+						if ( is_wp_error($cat_ID) )
+							continue;
 					}
 					$post_cats[] = $cat_ID;
 				}
@@ -479,6 +483,8 @@ class WP_Import {
 			if (count($tags) > 0) {
 				$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');
 					$tag_id = 0;
@@ -487,6 +493,8 @@ class WP_Import {
 					if ( $tag_id == 0 ) {
 						$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'];
 					}
 					$post_tags[] = intval($tag_id);