Ticket #22422: tumblr.patch

tumblr-importer.php

@@ -339 +339 @@
                 $done = true;
                 
                 $this->error=null;
-                
                 if ( !empty( $this->blog[$url]['progress'] ) ) {
                         $done = false;
                         do {
@@ -456 +455 @@
                 if ($this->blog[$url]['posts_complete'] + TUMBLR_MAX_IMPORT > $total) $count = $total - $start;
                 else $count = TUMBLR_MAX_IMPORT;
 
+                add_filter( 'tumblr_post_type', function() { return 'draft'; } );
                 $imported_posts = $this->fetch_posts($url, $start, $count, $this->email, $this->password, 'draft' );
 
                 if ( empty($imported_posts) ) {
@@ -748 +748 @@
                 $url = parse_url( $url, PHP_URL_HOST );
                 $post_type = apply_filters( 'tumblr_post_type', '' );
                 $url = trailingslashit( "http://api.tumblr.com/v2/blog/$url/posts/$post_type" );
-
+                
                 do_action( 'tumblr_importer_pre_fetch_posts' );
 
                 $params = array(
@@ -979 +979 @@
                 if ( empty( $this->access_tokens ) ) 
                         return false;
         
-                $params = array('oauth_consumer_key' => $this->consumerkey,
+                $params = array('oauth_consumer_key' => $this->get_consumer_key(),
                                 "oauth_nonce" => time(),
                                 "oauth_timestamp" => time(),
                                 "oauth_token" => $this->access_tokens['oauth_token'],