Ticket #6393: wp_export_import_links_with_cats_new.patch

wp-admin/link-import.php

@@ -100 +100 @@
 
                         include_once('link-parse-opml.php');
 
+                        $blogroll_cats = get_terms('link_category', 'get=all');
+                        foreach ($blogroll_cats as $category){
+                                $blogroll_categories[$category->name] = $category->term_id;
+                        }
+
                         $link_count = count($names);
                         for ( $i = 0; $i < $link_count; $i++ ) {
+
+                                if ( !$cat_id = is_term( $link_categories[$i], 'link_category' ) ) {
+                                        $cat_id = wp_insert_term( $link_categories[$i], 'link_category' );
+                                        $cat_id = $cat_id['term_id'];
+                                        $blogroll_categories[$link_categories[$i]] = $cat_id; //adding item to an array of link_cateories from database
+                                }
+                                else {
+                                        $cat_id = (int) $blogroll_categories[$link_categories[$i]];
+                                }
+
                                 if ('Last' == substr($titles[$i], 0, 4))
                                         $titles[$i] = '';
                                 if ( 'http' == substr($titles[$i], 0, 4) )
                                         $titles[$i] = '';
-                                $link = array( 'link_url' => $urls[$i], 'link_name' => $wpdb->escape($names[$i]), 'link_category' => array($cat_id), 'link_description' => $wpdb->escape($descriptions[$i]), 'link_owner' => $user_ID, 'link_rss' => $feeds[$i]);
+                                $link = array( 'link_url' => $urls[$i], 'link_name' => $wpdb->escape($names[$i]), 'link_category' => array($cat_id), 'link_description' => $wpdb->escape($descriptions[$i]), 'link_owner' => $user_ID, 'link_rss' => $feeds[$i], 'link_target' => $targets[$i]);
                                 wp_insert_link($link);
                                 echo sprintf('<p>'.__('Inserted <strong>%s</strong>').'</p>', $names[$i]);
                         }

wp-admin/link-parse-opml.php

@@ -9 +9 @@
         'TITLE'       => 'link_name',
         'TARGET'      => 'link_target',
         'DESCRIPTION' => 'link_description',
-        'XMLURL'      => 'link_rss'
+        'XMLURL'      => 'link_rss',
+        'CATEGORY'    => 'category'
 );
 
 $map = $opml_map;
@@ -20 +21 @@
  **/
 function startElement($parser, $tagName, $attrs) {
         global $updated_timestamp, $all_links, $map;
-        global $names, $urls, $targets, $descriptions, $feeds;
+        global $names, $urls, $targets, $descriptions, $feeds, $link_categories;
 
         if ($tagName == 'OUTLINE') {
                 foreach (array_keys($map) as $key) {
@@ -37 +38 @@
                 $targets[] = $link_target;
                 $feeds[] = $link_rss;
                 $descriptions[] = $link_description;
+                $link_categories[] = $category;
         } // end if outline
 }
 

wp-links-opml.php

@@ -26 +26 @@
 if (empty ($link_cat))
         $cats = get_categories("type=link&hierarchical=0");
 else
-        $cats = get_categories('type=link&hierarchical=0&include='.$link_cat);
+        $cats = array (get_category($link_cat));
 
 foreach ((array) $cats as $cat) {
         $catname = apply_filters('link_category', $cat->name);
 
-?>
-<outline type="category" title="<?php echo attribute_escape($catname); ?>">
-<?php
-
         $bookmarks = get_bookmarks("category={$cat->term_id}");
+
         foreach ((array) $bookmarks as $bookmark) {
                 $title = attribute_escape(apply_filters('link_title', $bookmark->link_name));
+                $description = attribute_escape(apply_filters('link_description', $bookmark->link_description));
+                $target = $bookmark->link_target;
 ?>
-        <outline text="<?php echo $title; ?>" type="link" xmlUrl="<?php echo attribute_escape($bookmark->link_rss); ?>" htmlUrl="<?php echo attribute_escape($bookmark->link_url); ?>" updated="<?php if ('0000-00-00 00:00:00' != $bookmark->link_updated) echo $bookmark->link_updated; ?>" />
+        <outline text="<?php echo $title; ?>" type="link" url="<?php echo attribute_escape($bookmark->link_url); ?>" category="<?php echo $catname; ?>" description="<?php echo $description; ?>" target="<?php echo $target; ?>" />
 <?php
 
         }
-?>
-</outline>
-<?php
-
 }
 ?>
 </body>