summaryrefslogtreecommitdiffstats
path: root/wp-admin/import
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-09-15 15:45:31 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-09-15 15:45:31 +0000
commit0bea7c7ad2ee8e82a86919b1cd2fea517cc67ec8 (patch)
tree5b95d4a59dbb761f8da80c9e894d22a7a547b00c /wp-admin/import
parent66b0871abeef45cdbe757c97a643076503b6c656 (diff)
downloadwordpress-mu-0bea7c7ad2ee8e82a86919b1cd2fea517cc67ec8.tar.gz
wordpress-mu-0bea7c7ad2ee8e82a86919b1cd2fea517cc67ec8.tar.xz
wordpress-mu-0bea7c7ad2ee8e82a86919b1cd2fea517cc67ec8.zip
Merge with WP 2.6.2
git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1471 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/import')
-rw-r--r--wp-admin/import/textpattern.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/wp-admin/import/textpattern.php b/wp-admin/import/textpattern.php
index c3fb1d7..bbddc08 100644
--- a/wp-admin/import/textpattern.php
+++ b/wp-admin/import/textpattern.php
@@ -333,7 +333,7 @@ class Textpattern_Import {
$category1 = get_category_by_slug($Category1);
$category1 = $category1->term_id;
$category2 = get_category_by_slug($Category2);
- $category2 = $category1->term_id;
+ $category2 = $category2->term_id;
if($cat1 = $category1) { $cats[1] = $cat1; }
if($cat2 = $category2) { $cats[2] = $cat2; }