WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@5552 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2007-05-26 17:47:20 +00:00
parent f24ed6715f
commit b068bd6447
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wp-admin/includes/upgrade.php
View File

@ -578,13 +578,28 @@ function upgrade_230() {
// Convert categories to terms. // Convert categories to terms.
$tt_ids = array(); $tt_ids = array();
$categories = $wpdb->get_results("SELECT * FROM $wpdb->categories"); $categories = $wpdb->get_results("SELECT * FROM $wpdb->categories ORDER BY cat_ID");
foreach ($categories as $category) { foreach ($categories as $category) {
$term_id = (int) $category->cat_ID; $term_id = (int) $category->cat_ID;
$name = $wpdb->escape($category->cat_name); $name = $wpdb->escape($category->cat_name);
$description = $wpdb->escape($category->category_description); $description = $wpdb->escape($category->category_description);
$slug = $wpdb->escape($category->category_nicename); $slug = $wpdb->escape($category->category_nicename);
$parent = $wpdb->escape($category->category_parent); $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')"); $wpdb->query("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES ('$term_id', '$name', '$slug', '$term_group')");
if ( !empty($category->category_count) ) { if ( !empty($category->category_count) ) {

2
wp-includes/taxonomy.php
View File

@ -67,7 +67,7 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
$term_group = $alias->term_group; $term_group = $alias->term_group;
} else { } else {
// The alias isn't in a group, so let's create a new one and firstly add the alias term to it. // The alias isn't in a group, so let's create a new one and firstly add the alias term to it.
$term_group = $wpdb->get_var("SELECT MAX() term_group FROM $wpdb->terms GROUP BY term_group") + 1; $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 = $alias->term_id"); $wpdb->query("UPDATE $wpdb->terms SET term_group = $term_group WHERE term_id = $alias->term_id");
} }
} }