WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@492 7be80a69-a1ef-0310-a953-fb0f7c49ff36

2 files changed, 6 insertions, 5 deletions

diff --git a/wp-inst/wp-admin/import/blogger.php b/wp-inst/wp-admin/import/blogger.php
index 2ad66ea..541c4f4 100644
--- a/wp-inst/wp-admin/import/blogger.php
+++ b/wp-inst/wp-admin/import/blogger.php
@@ -587,7 +587,7 @@ class Blogger_Import {
 		if ( count($this->import['blogs']) > 1 )

 			echo '<li>'.__('In case you haven\'t done it already, you can import the posts from your other blogs:'). $this->show_blogs() . '</li>';

 		if ( $n = count($this->import['blogs'][$_GET['blog']]['newusers']) )

-			echo '<li>'.sptintf(__('Go to <a href="%s" target="%s">Authors &amp; Users</a>, where you can modify the new user(s) or delete them. If you want to make all of the imported posts yours, you will be given that option when you delete the new authors.'), 'users.php', '_parent').'</li>';

+			echo '<li>'.sprintf(__('Go to <a href="%s" target="%s">Authors &amp; Users</a>, where you can modify the new user(s) or delete them. If you want to make all of the imported posts yours, you will be given that option when you delete the new authors.'), 'users.php', '_parent').'</li>';

 		echo '<li>'.__('For security, click the link below to reset this importer. That will clear your Blogger credentials and options from the database.').'</li>';

 		echo '</ul>';

 	}

diff --git a/wp-inst/wp-admin/import/livejournal.php b/wp-inst/wp-admin/import/livejournal.php
index bc6bb91..e8c48c4 100644
--- a/wp-inst/wp-admin/import/livejournal.php
+++ b/wp-inst/wp-admin/import/livejournal.php
@@ -67,8 +67,8 @@ class LJ_Import {
 				printf(__('Post <i>%s</i> already exists.'), stripslashes($post_title));
 			} else {
 				printf(__('Importing post <i>%s</i>...'), stripslashes($post_title));
-				$post = compact('post_author', 'post_date', 'post_content', 'post_title', 'post_status');
-				$post_id = wp_insert_post($post);
+				$postdata = compact('post_author', 'post_date', 'post_content', 'post_title', 'post_status');
+				$post_id = wp_insert_post($postdata);
 				if (!$post_id) {
 					_e("Couldn't get post ID");
 					echo '</li>';
@@ -113,9 +113,10 @@ class LJ_Import {
 					}
 				}
 			}
-			if ( $num_comments )
+			if ( $num_comments ) {
+				echo ' ';
 				printf(__('(%s comments)'), $num_comments);
-
+			}
 			echo '</li>';
 			flush();
 			ob_flush();