From 89fe0ff804e7c6497ebacc8b341ac89974f6f255 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Mon, 21 May 2007 18:37:58 +0000
Subject: WP Merge to rev 5499, this is a big one! Test it before you put it
 live! Test only, not for production use yet

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@972 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-admin/link-import.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'wp-admin/link-import.php')

diff --git a/wp-admin/link-import.php b/wp-admin/link-import.php
index 2c8accf..8502ed8 100644
--- a/wp-admin/link-import.php
+++ b/wp-admin/link-import.php
@@ -93,7 +93,12 @@ foreach ($categories as $category) {
 		}
 
 		if ( isset($opml_url) && $opml_url != '' ) {
-			$opml = wp_remote_fopen($opml_url);
+			if ( $blogrolling === true ) {
+				$opml = wp_remote_fopen($opml_url);
+			} else {
+				$opml = file_get_contents($opml_url);
+			}
+			
 			include_once('link-parse-opml.php');
 
 			$link_count = count($names);
@@ -118,6 +123,7 @@ else
 } // end else
 
 if ( ! $blogrolling )
+	apply_filters( 'wp_delete_file', $opml_url); 
 	@unlink($opml_url);
 ?>
 </div>
-- 
cgit