Ticket #16294: wrx_import.patch

wp-admin/includes/import.php

@@ -59 +59 @@
  * @return array Uploaded file's details on success, error message on failure
  */
 function wp_import_handle_upload() {
-        if ( !isset($_FILES['import']) ) {
-                $file['error'] = __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' );
-                return $file;
-        }
+  if($_POST['import_url']) {
+    $wrx_url = esc_url($_POST['import_url'], null, 'url');
+    if($wrx_url) {
+      $wrx_content = wp_remote_fopen($wrx_url);
+      $file = wp_upload_bits(basename($wrx_url) . ".txt", null, $wrx_content);
+    } else {
+      $file['error'] = __( 'The URL you entered is empty or invalid.' );
+      return $file;
+    }
+  } else {
+        if ( !isset($_FILES['import']) ) {
+                $file['error'] = __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' );
+                return $file;
+        } else {
+      $overrides = array( 'test_form' => false, 'test_type' => false );
+      $_FILES['import']['name'] .= '.txt';
+      $file = wp_handle_upload( $_FILES['import'], $overrides );
+      if ( isset( $file['error'] ) )
+        return $file;
+    }
+  }
 
-        $overrides = array( 'test_form' => false, 'test_type' => false );
-        $_FILES['import']['name'] .= '.txt';
-        $file = wp_handle_upload( $_FILES['import'], $overrides );
-
-        if ( isset( $file['error'] ) )
-                return $file;
-
         $url = $file['url'];
         $type = $file['type'];
         $file = $file['file'];

wp-admin/includes/template.php

@@ -847 +847 @@
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
 </p>
+<p>
+<label for="wxr_url"><?php _e( 'OR enter the url for your WXR file:' ); ?></label>
+<input type="text" id="wxr_url" name="import_url" size="50" />
+</p>
 <?php submit_button( __('Upload file and import'), 'button' ); ?>
 </form>
 <?php