diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-03-19 13:04:29 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-03-19 13:04:29 +0000 |
| commit | e08e3e006e1482c91ed76b24291f47f872f913ff (patch) | |
| tree | eb2ddf9b5b8eb5a46e412ded50090a1ef54143ee /wp-admin/import | |
| parent | 98190363e52787ef578afddbdd8d927ab703b286 (diff) | |
| download | wordpress-mu-e08e3e006e1482c91ed76b24291f47f872f913ff.tar.gz wordpress-mu-e08e3e006e1482c91ed76b24291f47f872f913ff.tar.xz wordpress-mu-e08e3e006e1482c91ed76b24291f47f872f913ff.zip | |
WP Merge to rev 5061
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@920 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/import')
| -rw-r--r-- | wp-admin/import/b2.php | 0 | ||||
| -rw-r--r-- | wp-admin/import/blogger.php | 10 |
2 files changed, 6 insertions, 4 deletions
diff --git a/wp-admin/import/b2.php b/wp-admin/import/b2.php deleted file mode 100644 index e69de29..0000000 --- a/wp-admin/import/b2.php +++ /dev/null diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php index 1890c16..4614bf6 100644 --- a/wp-admin/import/blogger.php +++ b/wp-admin/import/blogger.php @@ -84,7 +84,7 @@ class Blogger_Import { if ( empty($this->blogs) ) {
$headers = array(
"GET /feeds/default/blogs HTTP/1.0",
- "Host: www.blogger.com",
+ "Host: www2.blogger.com",
"Authorization: AuthSub token=\"$this->token\""
);
$request = join( "\r\n", $headers ) . "\r\n\r\n";
@@ -547,7 +547,9 @@ class Blogger_Import { }
$comment_post_ID = $this->blogs[$importing_blog]['posts'][$entry->old_post_permalink];
- $comment_author = addslashes( $this->no_apos( strip_tags( $entry->author ) ) );
+ preg_match('#<name>(.+?)</name>.*(?:\<uri>(.+?)</uri>)?#', $entry->author, $matches);
+ $comment_author = addslashes( $this->no_apos( strip_tags( (string) $matches[1] ) ) );
+ $comment_author_url = addslashes( $this->no_apos( strip_tags( (string) $matches[2] ) ) );
$comment_date = $this->convert_date( $entry->updated );
$comment_content = addslashes( $this->no_apos( html_entity_decode( $entry->content ) ) );
@@ -563,7 +565,7 @@ class Blogger_Import { ) {
++$this->blogs[$importing_blog]['comments_skipped'];
} else {
- $comment = compact('comment_post_ID', 'comment_author', 'comment_date', 'comment_content');
+ $comment = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_date', 'comment_content');
$comment_id = wp_insert_comment($comment);
@@ -672,7 +674,7 @@ class Blogger_Import { return $sock;
}
- function _get_blogger_sock($host = 'www.blogger.com') {
+ function _get_blogger_sock($host = 'www2.blogger.com') {
if ( !$sock = @ fsockopen($host, 80, $errno, $errstr) ) {
$this->uh_oh(
sprintf( __('Could not connect to %s'), $host ),
|