diff options
Diffstat (limited to 'wp-admin/import/blogger.php')
| -rw-r--r-- | wp-admin/import/blogger.php | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php index 4ad7a97..23e0807 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: www2.blogger.com",
+ "Host: www.blogger.com",
"Authorization: AuthSub token=\"$this->token\""
);
$request = join( "\r\n", $headers ) . "\r\n\r\n";
@@ -380,7 +380,9 @@ class Blogger_Import { $entry = "<feed>$entry</feed>";
$AtomParser = new AtomParser();
$AtomParser->parse( $entry );
- $this->import_post($AtomParser->entry);
+ $result = $this->import_post($AtomParser->entry);
+ if ( is_wp_error( $result ) )
+ return $result;
unset($AtomParser);
}
} else break;
@@ -509,15 +511,17 @@ class Blogger_Import { $post_content = str_replace('<hr>', '<hr />', $post_content);
// Checks for duplicates
- if (
- isset( $this->blogs[$importing_blog]['posts'][$entry->old_permalink] ) ||
- post_exists( $post_title, $post_content, $post_date )
- ) {
+ if ( isset( $this->blogs[$importing_blog]['posts'][$entry->old_permalink] ) ) {
+ ++$this->blogs[$importing_blog]['posts_skipped'];
+ } elseif ( $post_id = post_exists( $post_title, $post_content, $post_date ) ) {
+ $this->blogs[$importing_blog]['posts'][$entry->old_permalink] = $post_id;
++$this->blogs[$importing_blog]['posts_skipped'];
} else {
$post = compact('post_date', 'post_content', 'post_title', 'post_status');
$post_id = wp_insert_post($post);
+ if ( is_wp_error( $post_id ) )
+ return $post_id;
wp_create_categories( array_map( 'addslashes', $entry->categories ), $post_id );
@@ -531,6 +535,7 @@ class Blogger_Import { ++$this->blogs[$importing_blog]['posts_done'];
}
$this->save_vars();
+ return;
}
function import_comment( $entry ) {
@@ -767,7 +772,9 @@ 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 );
+ $result = $this->import_blog( $blog );
+ if ( is_wp_error( $result ) )
+ echo $result->get_error_message();
} elseif ( isset($_GET['token']) )
$this->auth();
elseif ( $this->token && $this->token_is_valid() )
@@ -915,11 +922,11 @@ class AtomParser { if(count($this->in_content) == 2) {
array_push($this->in_content, ">");
}
-
+
array_push($this->in_content, "<". $this->ns_to_prefix($name) ."{$xmlns_str}{$attrs_str}");
} else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
$this->in_content = array();
- $this->is_xhtml = $attrs['type'] == 'xhtml';
+ $this->is_xhtml = $attrs['type'] == 'xhtml';
array_push($this->in_content, array($tag,$this->depth));
} else if($tag == 'link') {
array_push($this->entry->links, $attrs);
@@ -935,7 +942,7 @@ class AtomParser { $tag = array_pop(split(":", $name));
if(!empty($this->in_content)) {
- if($this->in_content[0][0] == $tag &&
+ if($this->in_content[0][0] == $tag &&
$this->in_content[0][1] == $this->depth) {
array_shift($this->in_content);
if($this->is_xhtml) {
@@ -998,14 +1005,14 @@ class AtomParser { }
}
}
- }
+ }
return $name;
}
function xml_escape($string)
{
- return str_replace(array('&','"',"'",'<','>'),
- array('&','"',''','<','>'),
+ return str_replace(array('&','"',"'",'<','>'),
+ array('&','"',''','<','>'),
$string );
}
}
|