Changeset 14872

Timestamp:

05/25/2010 07:24:10 AM (16 years ago)

Author:

wpmuguru

Message:

ensure unique term_id when global terms enabled, see #13482

File:

• trunk/wp-includes/ms-functions.php (modified) (1 diff)

trunk/wp-includes/ms-functions.php

@@ -1236 +1236 @@
         } 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;
         }