From d8fe68385dcb63136a3d942fe5bd327a34f06eb4 Mon Sep 17 00:00:00 2001 From: wpmuguru Date: Tue, 25 May 2010 07:24:10 +0000 Subject: [PATCH] ensure unique term_id when global terms enabled, see #13482 git-svn-id: http://svn.automattic.com/wordpress/trunk@14872 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/ms-functions.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 551eb4a0b1..dd544bbf78 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -1235,8 +1235,9 @@ function global_terms( $term_id, $deprecated = '' ) { $global_id = $wpdb->insert_id; } else { $max_global_id = $wpdb->get_var( "SELECT MAX(cat_ID) FROM $wpdb->sitecategories" ); - $max_global_id += mt_rand( 100, 400 ); - $wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $global_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) ); + $max_local_id = $wpdb->get_var( "SELECT MAX(term_id) FROM $wpdb->terms" ); + $new_global_id = max( $max_global_id, $max_local_id ) + mt_rand( 100, 400 ); + $wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $new_global_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) ); $global_id = $wpdb->insert_id; } } elseif ( $global_id != $term_id ) {