Changeset 5937

Timestamp:

08/24/2007 02:44:26 PM (17 years ago)

Author:

ryan

Message:

Update WP importer to use taxonomy and query cat based on slug. see #4613

Location:

trunk

Files:

• wp-admin/import/wordpress.php (modified) (2 diffs)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (4 diffs)

trunk/wp-admin/import/wordpress.php

@@ -221 +221 @@
         global $wpdb;
 
-        $cat_names = (array) $wpdb->get_col("SELECT cat_name FROM $wpdb->categories");
+        $cat_names = (array) get_terms('category', 'fields=names');
 
         while ( $c = array_shift($this->categories) ) {
@@ -324 +324 @@
                 $post_cats = array();
                 foreach ($categories as $category) {
-                    $cat_ID = (int) $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE cat_name = '$category'");
+                    $slug = sanitize_term_field('slug', $category, 0, 'category', 'db');
+                    $cat = get_term_by('slug', $slug, 'category');
+                    $cat_ID = 0;
+                    if ( ! empty($cat) )
+                        $cat_ID = $cat->term_id;
                     if ($cat_ID == 0) {
+                        $category = $wpdb->escape($category);
                         $cat_ID = wp_insert_category(array('cat_name' => $category));
                     }

trunk/wp-includes/default-filters.php

@@ -34 +34 @@
     add_filter($filter, 'clean_url');
     add_filter($filter, 'wp_filter_kses');
+}
+
+// Slugs
+$filters = array('pre_term_slug');
+foreach ( $filters as $filter ) {
+    add_filter($filter, 'sanitize_title');
 }
 

trunk/wp-includes/taxonomy.php

@@ -283 +283 @@
  *      might be inaccurate or wrong.
  */
-function get_term_by($field, $value, $taxonomy, $output = OBJECT) {
+function get_term_by($field, $value, $taxonomy, $output = OBJECT, $filter = 'raw') {
     global $wpdb;
 
@@ -307 +307 @@
 
     wp_cache_add($term->term_id, $term, $taxonomy);
+
+    $term = sanitize_term($term, $taxonomy, $filter);
 
     if ( $output == OBJECT ) {
@@ -488 +490 @@
     else if ( 'ids' == $fields )
         $select_this = 't.term_id';
+    else if ( 'names' == $fields )
+        $select_this == 't.name';
 
     $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ($in_taxonomies) $where ORDER BY $orderby $order $number";
@@ -772 +776 @@
     if ( empty($slug) )
         $slug = sanitize_title($name);
-    else
-        $slug = sanitize_title($slug);
 
     $term_group = 0;