Changeset 8799

Timestamp:

09/03/2008 06:34:20 PM (16 years ago)

Author:

ryan

Message:

WXR Importer fix to resolve absolute urls without protocol and domain. fixes #7595

File:

• trunk/wp-admin/import/wordpress.php (modified) (2 diffs)

trunk/wp-admin/import/wordpress.php

@@ -106 +106 @@
                 if ( !$is_wxr_file && preg_match('|xmlns:wp="http://wordpress[.]org/export/\d+[.]\d+/"|', $importline) )
                     $is_wxr_file = true;
-
+                
+                if ( false !== strpos($importline, '<wp:base_site_url>') ) {
+                    preg_match('|<wp:base_site_url>(.*?)</wp:base_site_url>|is', $importline, $url);
+                    $this->base_url = $url[1];
+                    continue;
+                }
                 if ( false !== strpos($importline, '<wp:category>') ) {
                     preg_match('|<wp:category>(.*?)</wp:category>|is', $importline, $category);
@@ -540 +545 @@
         if ($this->fetch_attachments and $remote_url) {
             printf( __('Importing attachment <em>%s</em>... '), htmlspecialchars($remote_url) );
+            
+            // If the URL is absolute, but does not contain http, upload it assuming the base_site_url variable
+            if ( preg_match('/^\/[\w\W]+$/', $remote_url) )
+                $remote_url = rtrim($this->base_url,'/').$remote_url;
+            
             $upload = $this->fetch_remote_file($postdata, $remote_url);
             if ( is_wp_error($upload) ) {