Ticket #16984: 16984.diff

trunk/wordpress-importer.php

@@ -822 +822 @@
                 $post_id = wp_insert_attachment( $post, $upload['file'] );
                 wp_update_attachment_metadata( $post_id, wp_generate_attachment_metadata( $post_id, $upload['file'] ) );
 
-                // remap the thumbnail url.  this isn't perfect because we're just guessing the original url.
-                if ( preg_match( '@^image/@', $info['type'] ) && $thumb_url = wp_get_attachment_thumb_url( $post_id ) ) {
+                // remap resized image URLs, works by stripping the extension and remapping the URL stub.
+                if ( preg_match( '!^image/!', $info['type'] ) ) {
                         $parts = pathinfo( $url );
-                        $ext = $parts['extension'];
-                        $name = basename($parts['basename'], ".{$ext}");
-                        $this->url_remap[$parts['dirname'] . '/' . $name . '.thumbnail.' . $ext] = $thumb_url;
+                        $name = basename( $parts['basename'], ".{$parts['extension']}" ); // PATHINFO_FILENAME in PHP 5.2
+
+                        $parts_new = pathinfo( $upload['url'] );
+                        $name_new = basename( $parts_new['basename'], ".{$parts_new['extension']}" );
+
+                        $this->url_remap[$parts['dirname'] . '/' . $name] = $parts_new['dirname'] . '/' . $name_new;
                 }
 
                 return $post_id;
@@ -886 +889 @@
 
                 // keep track of the old and new urls so we can substitute them later
                 $this->url_remap[$url] = $upload['url'];
-                $this->url_remap[$post['guid']] = $upload['url'];
-                // if the remote url is redirected somewhere else, keep track of the destination too
+                $this->url_remap[$post['guid']] = $upload['url']; // r13735, really needed?
+                // keep track of the destination if the remote url is redirected somewhere else
                 if ( isset($headers['x-final-location']) && $headers['x-final-location'] != $url )
                         $this->url_remap[$headers['x-final-location']] = $upload['url'];