Changeset 5552

Timestamp:

05/26/07 17:47:20 (1 year ago)

Author:

ryan

Message:

During upgrade, make slugs unique and put like slugs in a term group. see #4189

Files:

• trunk/wp-admin/includes/upgrade.php (modified) (2 diffs)
• trunk/wp-includes/taxonomy.php (modified) (1 diff)

trunk/wp-admin/includes/upgrade.php

@@ -579 +579 @@
-    // Convert categories to terms.
-    $tt_ids = array();
-
+ ORDER BY cat_ID
-    foreach ($categories as $category) {
-        $term_id = (int) $category->cat_ID;
@@ -586 +586 @@
-        $slug = $wpdb->escape($category->category_nicename);
-        $parent = $wpdb->escape($category->category_parent);
+        $term_group = 0;
+
+        // Associate terms with the same slug in a term group and make slugs unique.
+        if ( $exists = $wpdb->get_results("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = '$slug'") ) {
+            $num = count($exists);
+            $num++;
+            $slug = $slug . "-$num";
+            $term_group = $exists[0]->term_group;
+            $id = $exists[0]->term_id;
+            if ( empty( $term_group ) ) {
+                $term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms GROUP BY term_group") + 1;
+                $wpdb->query("UPDATE $wpdb->terms SET term_group = '$term_group' WHERE term_id = '$id'");
+            }
+        }
+
-        $wpdb->query("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES ('$term_id', '$name', '$slug', '$term_group')");
-

trunk/wp-includes/taxonomy.php

@@ -68 +68 @@
-        } else {
-            // The alias isn't in a group, so let's create a new one and firstly add the alias term to it.
-) term_group
+term_group)
-            $wpdb->query("UPDATE $wpdb->terms SET term_group = $term_group WHERE term_id = $alias->term_id");
-        }