Changeset 13925 for trunk/wp-includes/taxonomy.php

Timestamp:

04/02/2010 01:26:44 AM (15 years ago)

Author:

wpmuguru

Message:

rework syncing of global terms, see #12663

File:

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

trunk/wp-includes/taxonomy.php

@@ -1546 +1546 @@
         // Make sure the slug is unique accross all taxonomies.
         $slug = wp_unique_term_slug($slug, (object) $args);
-        if ( !is_multisite() ) {
-            if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
-                return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
-            $term_id = (int) $wpdb->insert_id;
-        } else {
-            $maxterm = $wpdb->get_var( "SELECT max(term_id) FROM {$wpdb->terms}" );
-            $term_id = mt_rand( $maxterm+100, $maxterm+4000 );
-            if ( false === $wpdb->insert( $wpdb->terms, compact( 'term_id', 'name', 'slug', 'term_group' ) ) )
-                return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
-        }
+        if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
+            return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
+        $term_id = (int) $wpdb->insert_id;
     } else if ( is_taxonomy_hierarchical($taxonomy) && !empty($parent) ) {
         // If the taxonomy supports hierarchy and the term has a parent, make the slug unique
         // by incorporating parent slugs.
         $slug = wp_unique_term_slug($slug, (object) $args);
-        if ( !is_multisite() ) {
-            if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
-                return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
-            $term_id = (int) $wpdb->insert_id;
-        } else {
-            $maxterm = $wpdb->get_var( "SELECT max(term_id) FROM {$wpdb->terms}" );
-            $term_id = mt_rand( $maxterm+100, $maxterm+4000 );
-            if ( false === $wpdb->insert( $wpdb->terms, compact( 'term_id','name', 'slug', 'term_group' ) ) )
-                return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
-        }
+        if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
+            return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
+        $term_id = (int) $wpdb->insert_id;
     }