WP Merge to rev 4956

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

2 files changed, 15 insertions, 15 deletions

diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php
index b5c1169..2908bbc 100644
--- a/wp-admin/import/blogger.php
+++ b/wp-admin/import/blogger.php
@@ -55,7 +55,7 @@ class Blogger_Import {
 			return false;

 		}

 		$this->token = $matches[1];

-		

+

 		wp_redirect( remove_query_arg( array( 'token', 'noheader' ) ) );

 	}

 

@@ -369,9 +369,9 @@ class Blogger_Import {
 				$sock = $this->_get_blogger_sock( $blog['host'] );

 				if ( ! $sock ) return; // TODO: Error handling

 				$response = $this->_txrx( $sock, $request );

-	

+

 				$response = $this->parse_response( $response );

-	

+

 				// Extract the entries and send for insertion

 				preg_match_all( '/<entry[^>]*>.*?<\/entry>/s', $response['body'], $matches );

 				if ( count( $matches[0] ) ) {

@@ -437,7 +437,7 @@ class Blogger_Import {
 					foreach ( $entries as $entry ) {

 						$entry = "<feed>$entry</feed>";

 						$AtomParser = new AtomParser();

-						$AtomParser->parse( $entry );	

+						$AtomParser->parse( $entry );

 						$this->import_comment($AtomParser->entry);

 						unset($AtomParser);

 					}

@@ -623,7 +623,7 @@ class Blogger_Import {
 			$sel = ( $user->user_id == $current ) ? " selected='selected'" : '';

 			$options .= "<option value='$user->user_id'$sel>$user->display_name</option>";

 		}

-		

+

 		return $options;

 	}

 

@@ -706,7 +706,7 @@ class Blogger_Import {
 	function restart() {

 		global $wpdb;

 		$options = get_option( 'blogger_importer' );

-		

+

 		if ( isset( $options['token'] ) )

 			$this->revoke( $options['token'] );

 

@@ -922,7 +922,7 @@ class AtomParser {
 		} else if($tag == 'category') {

 			array_push($this->entry->categories, $attrs['term']);

 		}

-		

+

 		$this->ns_decls = array();

 	}

 

@@ -950,7 +950,7 @@ class AtomParser {
 		}

 

 		array_shift($this->ns_contexts);

-		

+

 		#print str_repeat(" ", $this->depth * $this->indent) . "end_element('$name')" ."\n";

 

 		$this->depth--;

diff --git a/wp-admin/import/greymatter.php b/wp-admin/import/greymatter.php
index 7332937..9203ff7 100644
--- a/wp-admin/import/greymatter.php
+++ b/wp-admin/import/greymatter.php
@@ -91,7 +91,7 @@ class GM_Import {
 
 		if (!chdir($gmpath))
 			wp_die(sprintf(__("Wrong path, %s\ndoesn't exist\non the server"), $gmpath));
-			
+
 		$this->header();
 ?>
 <p><?php _e('The importer is running...') ?></p>
@@ -128,7 +128,7 @@ class GM_Import {
 		$user_info = array("user_login"=>"$user_login", "user_pass"=>"$pass1", "user_nickname"=>"$user_nickname", "user_email"=>"$user_email", "user_url"=>"$user_url", "user_ip"=>"$user_ip", "user_domain"=>"$user_domain", "user_browser"=>"$user_browser", "dateYMDhour"=>"$user_joindate", "user_level"=>"1", "user_idmode"=>"nickname");
 		$user_id = wp_insert_user($user_info);
 		$this->gmnames[$userdata[0]] = $user_id;
-		
+
 		printf('<li>'.__('user %s...').' <strong>'.__('Done').'</strong></li>', "<em>$user_login</em>");
 	}
 
@@ -213,21 +213,21 @@ class GM_Import {
 					$user_email=$wpdb->escape("user@deleted.com");
 					$user_url=$wpdb->escape("");
 					$user_joindate=$wpdb->escape($user_joindate);
-					
+
 					$user_info = array("user_login"=>$user_login, "user_pass"=>$pass1, "user_nickname"=>$user_nickname, "user_email"=>$user_email, "user_url"=>$user_url, "user_ip"=>$user_ip, "user_domain"=>$user_domain, "user_browser"=>$user_browser, "dateYMDhour"=>$user_joindate, "user_level"=>0, "user_idmode"=>"nickname");
 					$user_id = wp_insert_user($user_info);
 					$this->gmnames[$postinfo[1]] = $user_id;
-					
+
 					echo ': ';
 					printf(__('registered deleted user %s at level 0 '), "<em>$user_login</em>");
 				}
-			
+
 				if (array_key_exists($postinfo[1], $this->gmnames)) {
 					$post_author = $this->gmnames[$postinfo[1]];
 				} else {
 					$post_author = $user_id;
 				}
-			
+
 				$postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'comment_status', 'ping_status', 'post_modified', 'post_modified_gmt');
 				$post_ID = wp_insert_post($postdata);
 			}
@@ -309,5 +309,5 @@ class GM_Import {
 
 $gm_import = new GM_Import();
 
-register_importer('greymatter', __('Greymatter'), __('Import posts and comments from your Greymatter blog'), array ($gm_import, 'dispatch'));
+register_importer('greymatter', __('GreyMatter'), __('Import users, posts, and comments from a Greymatter blog'), array ($gm_import, 'dispatch'));
 ?>