WP Merge to rev 5499, this is a big one! Test it before you put it live!

Test only, not for production use yet


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

1 files changed, 3 insertions, 1 deletions

diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php
index fdc6004..4ad7a97 100644
--- a/wp-admin/import/blogger.php
+++ b/wp-admin/import/blogger.php
@@ -743,10 +743,11 @@ class Blogger_Import {
 

 	// Step 9: Congratulate the user

 	function congrats() {

+		$blog = (int) $_GET['blog'];

 		echo '<h1>'.__('Congratulations!').'</h1><p>'.__('Now that you have imported your Blogger blog into WordPress, what are you going to do? Here are some suggestions:').'</p><ul><li>'.__('That was hard work! Take a break.').'</li>';

 		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']) )

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

 			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.').'</li>';

 		echo '</ul>';

@@ -765,6 +766,7 @@ class Blogger_Import {
 

 		if ( isset( $_REQUEST['blog'] ) ) {

 			$blog = is_array($_REQUEST['blog']) ? array_shift( array_keys( $_REQUEST['blog'] ) ) : $_REQUEST['blog'];

+			$blog = (int) $blog;

 			$this->import_blog( $blog );

 		} elseif ( isset($_GET['token']) )

 			$this->auth();