diff --git a/wp-admin/link-import.php b/wp-admin/link-import.php index a42b781092..2396e625c6 100644 --- a/wp-admin/link-import.php +++ b/wp-admin/link-import.php @@ -32,7 +32,7 @@ switch ($step) {
-

Import your blogroll from another system

+

Import your blogroll from another system

@@ -86,7 +86,7 @@ switch ($step) { ?>
-

Importing...

+

Importing...

query($query); echo "

Inserted {$names[$i]}

"; } diff --git a/wp-admin/link-parse-opml.php b/wp-admin/link-parse-opml.php index 8941e8e1e5..7adbafd3ff 100644 --- a/wp-admin/link-parse-opml.php +++ b/wp-admin/link-parse-opml.php @@ -6,11 +6,14 @@ require_once(ABSPATH.WPINC.'/functions.php'); // we need to map XML attribute names to our columns // if we are doing OPML use this map $opml_map = array( - 'link_url' => 'URL', - 'link_name' => 'TEXT', - 'link_target' => 'TARGET', - 'link_description' => 'DESCRIPTION' - ); +'link_url' => 'URL', +'link_url' => 'HTMLURL', +'link_name' => 'TEXT', +'link_name' => 'TITLE', +'link_target' => 'TARGET', +'link_description' => 'DESCRIPTION', +'link_rss' => 'XMLURL' +); $map = $opml_map; @@ -20,7 +23,7 @@ $map = $opml_map; **/ function startElement($parser, $tagName, $attrs) { global $updated_timestamp, $all_links, $map; - global $names, $urls, $targets, $descriptions; + global $names, $urls, $targets, $descriptions, $feeds; if ($tagName == 'OUTLINE') { if ($map['link_url'] != '') @@ -31,11 +34,14 @@ function startElement($parser, $tagName, $attrs) { $link_target = $attrs[$map['link_target']]; if ($map['link_description'] != '') $link_description = $attrs[$map['link_description']]; + if ($map['link_rss'] != '') + $link_rss = $attrs[$map['link_rss']]; //echo("got data: link_url = [$link_url], link_name = [$link_name], link_target = [$link_target], link_description = [$link_description]
\n"); // save the data away. $names[] = $link_name; $urls[] = $link_url; $targets[] = $link_target; + $feeds[] = $link_rss; $descriptions[] = $link_description; } }