Ticket #13391: terms.diff

wpmu-terms.php

@@ -76 +76 @@
                 switch_to_blog( $id );
         }
         
-        $maxterm = $wpdb->get_var( "SELECT max(cat_ID) FROM {$wpdb->sitecategories}" );
+        $maxterm = max($wpdb->get_var( "SELECT max(cat_ID) FROM {$wpdb->sitecategories}" ),
+                       $wpdb->get_var( "SELECT max(term_id) FROM {$wpdb->terms}" ) );
         $rows = $wpdb->get_results( "SELECT * FROM {$wpdb->terms}" );
         foreach( $rows as $row ) {
                 if ( isset( $_POST[ 'renameterms' ] ) && sanitize_title( $row->name ) != $row->slug ) {
@@ -87 +88 @@
                 }
                 if ( $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->sitecategories} WHERE cat_ID = %d AND category_nicename = %s", $row->term_id, $row->slug ) ) )
                         continue;
-                $term_id = $row->term_id + mt_rand( $maxterm+100, $maxterm+4000 );
+                $term_id = $row->term_id + $maxterm;
                 if( get_option( 'default_category' ) == $row->term_id )
                         update_option( 'default_category', $term_id );